From nobody Mon May 6 18:46:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585650137; cv=none; d=zohomail.com; s=zohoarc; b=TWzKDLpfc96PZoup+Dp4G4H1xLeC74LR9901Xq0fwC7+HXebfdlZal2jxpIn+SRt2eBGr7V1QTU8TXzOYhs+FDClL3RdPBftlSuwhNeqmZytdXiU37znYuduzMp5QZEGDNTTKrkFSzU6ejXpGP1Iy3os5UBnnokoAnwSOqJhD6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585650137; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vvbMjAd82toXfMqTysWXusuFuFcdPXEVpsuUIFJraDQ=; b=gROJ9+tpz6lic7NuANmY4PAvj5fmrOR7tm3NZfkgvl/qZL8Lw2Z1cD3tLBiXrzo5IZv2HmzxK07Fep3vRbeopT6yaQMCjm9HCtHXBl88gvvt0Cr2bAzG5qzlYi3l3tLEH4te1LUSa0x1bwPd1Pnc9zH6ugkv3dTCVqoEnTKpFYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 15856501372951013.5947971724759; Tue, 31 Mar 2020 03:22:17 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-124-SgjYBIq0OHieI_VQuoN7PA-1; Tue, 31 Mar 2020 06:22:02 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D72A813F6; Tue, 31 Mar 2020 10:21:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9556160BE0; Tue, 31 Mar 2020 10:21:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2E388180880B; Tue, 31 Mar 2020 10:21:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02VALqBl028204 for ; Tue, 31 Mar 2020 06:21:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F950100EBB7; Tue, 31 Mar 2020 10:21:52 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61BEE1001B2B; Tue, 31 Mar 2020 10:21:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585650136; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vvbMjAd82toXfMqTysWXusuFuFcdPXEVpsuUIFJraDQ=; b=GQhGX/qjBi8OrHhx9gQw/pkki2IuifYfH4IGGRunu+JwEMrp7rEsGrEJUyE5CnKuotUWzg Ur5JTXmWgmiwETF/YSsXUw84L2NzO7GPzGQa4hQUCRntLZgjOwKURzurXmx7PCOORgmHjT t4UvYjpa9xeUEil7kxCbp/7Mf/VJEj4= X-MC-Unique: SgjYBIq0OHieI_VQuoN7PA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [virttools-web PATCH 1/3] Convert README to markdown format Date: Tue, 31 Mar 2020 11:21:43 +0100 Message-Id: <20200331102145.360927-2-berrange@redhat.com> In-Reply-To: <20200331102145.360927-1-berrange@redhat.com> References: <20200331102145.360927-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Andrea Bolognani --- README | 19 ------------------- README.md | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 9126ab1..0000000 --- a/README +++ /dev/null @@ -1,19 +0,0 @@ - Virt Tools static site - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -This directory contains content / configuration for managing - - http(s)://virttools.org - http(s)://virt-tools.org - http(s)://www.virttools.org - http(s)://www.virt-tools.org - -The site is setup to run under OpenShift - -Initial load can be done with - - oc process -f virttools-web/openshift/templates/virttools-web.json | oc= create -f - - -Updates to the OpenShift config are manually activated using 'oc replace'. - -Updates to the content itself are automatically propagated via a web hook. diff --git a/README.md b/README.md new file mode 100644 index 0000000..5b7a60d --- /dev/null +++ b/README.md @@ -0,0 +1,21 @@ +Virt Tools static site +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This directory contains content / configuration for managing + +* [https://virttools.org](https://virttools.org) +* [https://virt-tools.org](https://virt-tools.org) +* [https://www.virttools.org](https://www.virttools.org) +* [https://www.virt-tools.org](https://www.virt-tools.org) + +The site is setup to run under OpenShift + +Initial load can be done with + +``` + oc process -f virttools-web/openshift/templates/virttools-web.json | oc= create -f - +``` + +Updates to the OpenShift config are manually activated using `oc replace`. + +Updates to the content itself are automatically propagated via a web hook. --=20 2.24.1 From nobody Mon May 6 18:46:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585650137; cv=none; d=zohomail.com; s=zohoarc; b=DyZVOBfzioGLzAajD0KfV2rb2JqKPL2yFeQux6VK5RfN/0mGoCtnUYSefng5IBAeBjqxM4VzJuTAx6bOXQX9tGbyC2TOes/qPUNeuFLTiIPAB82DOST4FY8YE7eWYnUyAG/8LbB6C5rTx70XXfkn/PHhOJa4/irFxC+knH8LaW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585650137; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WGhdtnI1kvXCa1lNzsaTsWvu2LxACpZU9dvSI+9+230=; b=IsxAQoe3wlFSzj4Y6pbY8l/zfrdStO6/ias85zXCpCY+uOZw4yST4tSc2nlKB8RKpBS5XjgjpoOavMDQud+8Pl4CndpgLKfxQzwqZnbogt+q8OoIwZEjD3d9/Zhbs30tfXB38Mc1aRffcY1QY2694fzwoJTg3noXOchbLwsRwk0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1585650137075448.39120724902125; Tue, 31 Mar 2020 03:22:17 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-81-O81XtJ-8NMech6H0rqpWEg-1; Tue, 31 Mar 2020 06:22:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE2818010FE; Tue, 31 Mar 2020 10:21:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ECA5750C01; Tue, 31 Mar 2020 10:21:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7CB5B180880D; Tue, 31 Mar 2020 10:21:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02VALrqv028215 for ; Tue, 31 Mar 2020 06:21:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC940100EBC3; Tue, 31 Mar 2020 10:21:53 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id E70E61001DD8; Tue, 31 Mar 2020 10:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585650135; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=WGhdtnI1kvXCa1lNzsaTsWvu2LxACpZU9dvSI+9+230=; b=Y2hrT+rDuvAtUsvPNTZf7GN/w34MDsXIwafiJyXPILkNK5mG6mV79u8ioI6mfGraoe7OvJ grzp+vi8wNOERMKdaXRMXvxHmWq1IWnw8qosyWAg1e6jVgoRNOZHlMQ6kGra5RYNLDiMC2 tNALyQUWp3IPJ/y1Wex2oPV8uVHQhhg= X-MC-Unique: O81XtJ-8NMech6H0rqpWEg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [virttools-web PATCH 2/3] Introduce use of GitLab CI for publishing to GitLab Pages Date: Tue, 31 Mar 2020 11:21:44 +0100 Message-Id: <20200331102145.360927-3-berrange@redhat.com> In-Reply-To: <20200331102145.360927-1-berrange@redhat.com> References: <20200331102145.360927-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" To publish to GitLab pages, all that is required is to provide a CI job that creates files in a directory called "public" and list that as an artifact. When the CI job completes, the website is immediately available at the URL https://username.gitlab.io/reponame. This makes it much easier to preview changes to the site than with OpenShift apps. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Andrea Bolognani --- .gitlab-ci.yml | 9 +++++++++ README.md | 14 ++++---------- {web =3D> public}/header-bg.png | Bin {web =3D> public}/index.css | 0 {web =3D> public}/index.html | 4 +--- {web =3D> public}/logo-kvm.png | Bin {web =3D> public}/logo-libguestfs.png | Bin {web =3D> public}/logo-libosinfo.png | Bin {web =3D> public}/logo-libvirt.png | Bin {web =3D> public}/logo-qemu.png | Bin {web =3D> public}/logo-virt-manager.png | Bin {web =3D> public}/logo.png | Bin {web =3D> public}/logo.xcf | Bin 13 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 .gitlab-ci.yml rename {web =3D> public}/header-bg.png (100%) rename {web =3D> public}/index.css (100%) rename {web =3D> public}/index.html (93%) rename {web =3D> public}/logo-kvm.png (100%) rename {web =3D> public}/logo-libguestfs.png (100%) rename {web =3D> public}/logo-libosinfo.png (100%) rename {web =3D> public}/logo-libvirt.png (100%) rename {web =3D> public}/logo-qemu.png (100%) rename {web =3D> public}/logo-virt-manager.png (100%) rename {web =3D> public}/logo.png (100%) rename {web =3D> public}/logo.xcf (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..5613e31 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,9 @@ + +image: centos:8 + +pages: + script: + - /bin/true + artifacts: + paths: + - public diff --git a/README.md b/README.md index 5b7a60d..a0c5a5e 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,8 @@ This directory contains content / configuration for managi= ng * [https://www.virttools.org](https://www.virttools.org) * [https://www.virt-tools.org](https://www.virt-tools.org) =20 -The site is setup to run under OpenShift +The site is intended to be published with GitLab Pages =20 -Initial load can be done with - -``` - oc process -f virttools-web/openshift/templates/virttools-web.json | oc= create -f - -``` - -Updates to the OpenShift config are manually activated using `oc replace`. - -Updates to the content itself are automatically propagated via a web hook. +Upon pushing changes to the GitLab repository, CI rules will automatically +build the site and publish the result to the repository's GitLab Pages +site. diff --git a/web/header-bg.png b/public/header-bg.png similarity index 100% rename from web/header-bg.png rename to public/header-bg.png diff --git a/web/index.css b/public/index.css similarity index 100% rename from web/index.css rename to public/index.css diff --git a/web/index.html b/public/index.html similarity index 93% rename from web/index.html rename to public/index.html index 3fb6f48..d801c48 100644 --- a/web/index.html +++ b/public/index.html @@ -92,9 +92,7 @@ =20 =20 diff --git a/web/logo-kvm.png b/public/logo-kvm.png similarity index 100% rename from web/logo-kvm.png rename to public/logo-kvm.png diff --git a/web/logo-libguestfs.png b/public/logo-libguestfs.png similarity index 100% rename from web/logo-libguestfs.png rename to public/logo-libguestfs.png diff --git a/web/logo-libosinfo.png b/public/logo-libosinfo.png similarity index 100% rename from web/logo-libosinfo.png rename to public/logo-libosinfo.png diff --git a/web/logo-libvirt.png b/public/logo-libvirt.png similarity index 100% rename from web/logo-libvirt.png rename to public/logo-libvirt.png diff --git a/web/logo-qemu.png b/public/logo-qemu.png similarity index 100% rename from web/logo-qemu.png rename to public/logo-qemu.png diff --git a/web/logo-virt-manager.png b/public/logo-virt-manager.png similarity index 100% rename from web/logo-virt-manager.png rename to public/logo-virt-manager.png diff --git a/web/logo.png b/public/logo.png similarity index 100% rename from web/logo.png rename to public/logo.png diff --git a/web/logo.xcf b/public/logo.xcf similarity index 100% rename from web/logo.xcf rename to public/logo.xcf --=20 2.24.1 From nobody Mon May 6 18:46:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585650139; cv=none; d=zohomail.com; s=zohoarc; b=M1t2mIRPwHhw17PXIYfDy+2cxGtJwSfe2sOdGBvqhKmFfXNuOv41wd15Oe0OE0zTswyD9wCqOXrUtPfzHVx324eko6I9cpVc85dxk8bvjkfTjFqPeNAUzU+h+5pMXBEtLSzr5WBMm8U1jF8zXXikUPKMKa4wQoXtc5mWgFhKC3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585650139; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wJp4dxvOSXKwDWrzVn+LpO/6LbDVRmYPtpz+ayUtWpc=; b=WAnmkwUt/DYE+TrNL3vOCopBrMXKmOHXW+NY9OofYj6SpIgbf45O2vxbHe/STChORBIeiL95k192Vn36HrHClcccjWPIffxmJAD6ssFN5c1/ArRUucFBxTtwFWLczenYg8XibGxWFZbQVr0bwKe9UUF+bo+6leCFCszvOJs3fik= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1585650139063625.0423309864261; Tue, 31 Mar 2020 03:22:19 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-LmGm2GrKOt-XPlxpVfwQLA-1; Tue, 31 Mar 2020 06:22:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C59C8014CA; Tue, 31 Mar 2020 10:22:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF02D98A38; Tue, 31 Mar 2020 10:22:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 78CF91803C32; Tue, 31 Mar 2020 10:22:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02VALt8a028225 for ; Tue, 31 Mar 2020 06:21:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id BEA031001B2B; Tue, 31 Mar 2020 10:21:55 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 445981001DD8; Tue, 31 Mar 2020 10:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585650137; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=wJp4dxvOSXKwDWrzVn+LpO/6LbDVRmYPtpz+ayUtWpc=; b=cA2x4/K1Ke0UvfP3Yw8yHL+QwJOIdX8zpiD6uCvvPpv7j9OIT0IgpYnD0uMpF2DA1udS6v +SKg9dSkb5USoaoNgwQwt8m2Vf8kHD9khOoazWDk1JRz/PnVRcBligEl4zVlWO3sRtt1nl k89eEwiKf0ib6XkEqXXzExEcGfRT0ik= X-MC-Unique: LmGm2GrKOt-XPlxpVfwQLA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [virttools-web PATCH 3/3] Remove obsolete openshift hosting configuration Date: Tue, 31 Mar 2020 11:21:45 +0100 Message-Id: <20200331102145.360927-4-berrange@redhat.com> In-Reply-To: <20200331102145.360927-1-berrange@redhat.com> References: <20200331102145.360927-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Andrea Bolognani --- openshift/templates/.gitignore | 2 - openshift/templates/update-tls.sh | 16 -- openshift/templates/virttools-web-tls.json | 82 ------- openshift/templates/virttools-web.json | 272 --------------------- 4 files changed, 372 deletions(-) delete mode 100644 openshift/templates/.gitignore delete mode 100755 openshift/templates/update-tls.sh delete mode 100644 openshift/templates/virttools-web-tls.json delete mode 100644 openshift/templates/virttools-web.json diff --git a/openshift/templates/.gitignore b/openshift/templates/.gitignore deleted file mode 100644 index 199c6e6..0000000 --- a/openshift/templates/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -tls-cert.pem -tls-key.pem diff --git a/openshift/templates/update-tls.sh b/openshift/templates/update= -tls.sh deleted file mode 100755 index 9b62697..0000000 --- a/openshift/templates/update-tls.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -function die() { - echo $* - exit 1 -} - -test -f "tls-cert.pem" || die "Missing tls-cert.pem" -test -f "tls-key.pem" || die "Missing tls-key.pem" - -TLS_CERT=3D`cat tls-cert.pem` -TLS_KEY=3D`cat tls-key.pem` - -oc process -f virttools-web-tls.json | oc delete -f - -oc process -p TLS_CERT=3D"$TLS_CERT" -p TLS_KEY=3D"$TLS_KEY" -f virttools-= web-tls.json | oc create -f - - diff --git a/openshift/templates/virttools-web-tls.json b/openshift/templat= es/virttools-web-tls.json deleted file mode 100644 index b7d1d33..0000000 --- a/openshift/templates/virttools-web-tls.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Template", - "labels": { - "app": "virttools-web", - "template": "virttools-web" - }, - "message": "The following service(s) have been created in your project= : ${NAME}.\n", - "metadata": { - "name": "virtttools-web", - "annotations": { - "openshift.io/display-name": "Virt Tools", - "description": "Static web for virt-tools.org", - "tags": "quickstart,httpd", - "iconClass": "icon-apache", - "openshift.io/long-description": "Template for virttools.org s= tatic web content", - "openshift.io/provider-display-name": "Libvirt", - "template.openshift.io/bindable": "false" - } - }, - "objects": [ - { - "kind": "Route", - "apiVersion": "v1", - "metadata": { - "name": "www.virt-tools.org" - }, - "spec": { - "host": "www.virt-tools.org", - "to": { - "kind": "Service", - "name": "${NAME}" - }, - "tls": { - "termination": "edge", - "insecureEdgeTerminationPolicy": "Redirect", - "key": "${TLS_KEY}", - "certificate": "${TLS_CERT}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "metadata": { - "name": "www.virttools.org" - }, - "spec": { - "host": "www.virttools.org", - "to": { - "kind": "Service", - "name": "${NAME}" - }, - "tls": { - "termination": "edge", - "insecureEdgeTerminationPolicy": "Redirect", - "key": "${TLS_KEY}", - "certificate": "${TLS_CERT}" - } - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objec= ts defined in this template.", - "required": true, - "value": "virttools-web" - }, - { - "name": "TLS_KEY", - "displayName": "TLS key for public routes", - "description": "TLS key for public routes" - }, - { - "name": "TLS_CERT", - "displayName": "TLS cert for public routes", - "description": "TLS cert for public routes" - } - ] -} diff --git a/openshift/templates/virttools-web.json b/openshift/templates/v= irttools-web.json deleted file mode 100644 index 0e60a44..0000000 --- a/openshift/templates/virttools-web.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Template", - "labels": { - "app": "virttools-web", - "template": "virttools-web" - }, - "message": "The following service(s) have been created in your project= : ${NAME}.\n", - "metadata": { - "name": "virtttools-web", - "annotations": { - "openshift.io/display-name": "Virt Tools", - "description": "Static web for virt-tools.org", - "tags": "quickstart,httpd", - "iconClass": "icon-apache", - "openshift.io/long-description": "Template for virttools.org s= tatic web content", - "openshift.io/provider-display-name": "Libvirt", - "template.openshift.io/bindable": "false" - } - }, - "objects": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}", - "annotations": { - "description": "Exposes and load balances the applicat= ion pods" - } - }, - "spec": { - "ports": [ - { - "name": "web", - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "name": "${NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}" - }, - "spec": { - "host": "${APPLICATION_DOMAIN}", - "to": { - "kind": "Service", - "name": "${NAME}" - }, - "tls": { - "termination": "edge", - "insecureEdgeTerminationPolicy": "Allow" - } - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}", - "annotations": { - "description": "Keeps track of changes in the applicat= ion image" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}", - "annotations": { - "description": "Defines how to build the application", - "template.alpha.openshift.io/wait-for-ready": "true" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "from": { - "kind": "DockerImage", - "name": "centos/httpd-24-centos7:latest" - } - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "triggers": [ - { - "type": "ImageChange" - }, - { - "type": "ConfigChange" - }, - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - } - ] - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}", - "annotations": { - "description": "Defines how to deploy the application = server", - "template.alpha.openshift.io/wait-for-ready": "true" - } - }, - "spec": { - "strategy": { - "type": "Rolling" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "virttools-web" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "name": "${NAME}" - }, - "template": { - "metadata": { - "name": "${NAME}", - "labels": { - "name": "${NAME}" - } - }, - "spec": { - "containers": [ - { - "name": "virttools-web", - "image": " ", - "ports": [ - { - "containerPort": 8080 - } - ], - "readinessProbe": { - "timeoutSeconds": 3, - "initialDelaySeconds": 3, - "httpGet": { - "path": "/", - "port": 8080 - } - }, - "livenessProbe": { - "timeoutSeconds": 3, - "initialDelaySeconds": 30, - "httpGet": { - "path": "/", - "port": 8080 - } - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - }, - "env": [ - ] - } - ] - } - } - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objec= ts defined in this template.", - "required": true, - "value": "virttools-web" - }, - { - "name": "NAMESPACE", - "displayName": "Namespace", - "description": "The OpenShift Namespace where the ImageStream = resides.", - "required": true, - "value": "openshift" - }, - { - "name": "MEMORY_LIMIT", - "displayName": "Memory Limit", - "description": "Maximum amount of memory the container can use= .", - "required": true, - "value": "512Mi" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "The URL of the repository with your applicatio= n source code.", - "required": true, - "value": "git://libvirt.org/virttools-web.git" - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of= your repository if you are not using the default branch." - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Set this to the relative path to your project = if it is not in the root of your repository.", - "value": "web" - }, - { - "name": "APPLICATION_DOMAIN", - "displayName": "Application Hostname", - "description": "The exposed hostname that will route to the ht= tpd service, if left blank a value will be defaulted.", - "value": "" - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "GitHub Webhook Secret", - "description": "Github trigger secret. A difficult to guess s= tring encoded as part of the webhook URL. Not encrypted.", - "generate": "expression", - "from": "[a-zA-Z0-9]{40}" - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "A secret string used to configure the Generic = webhook.", - "generate": "expression", - "from": "[a-zA-Z0-9]{40}" - } - ] -} --=20 2.24.1