From nobody Wed May 8 00:24:53 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=1585649356; cv=none; d=zohomail.com; s=zohoarc; b=S0A7zAd1oLaT0NbisTpWIQfXg7+0xggkqMWbZCt+s51d6ww5bR4p1wNQ9Nr+9NUYrNZuHfwPVRP9obwpDbKi2Ea0hCrn6BHL2gvfF9Sbhy45kTsQhbsyaKi6coyv8+AlPOVdKcR8UAwBN5701ZTzADiFJf2Nm8j+UBKHKqZKWLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585649356; 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=12DFTgIHBkkDc7z9I1DLM3iWy/VUjUeu0ScT3iYG2Og=; b=HbDiabmzKEPahGHoT3zLJMSVU6BMskPZsm1FVlevQkCYQSz4Mc7Mf1TlVC5azl7fkpPFrHwrJwUxLabNx4jVRkw+5t3Hh3gZYSIDPme1x3SEMnQTHPV2EMj0KXg4dxFpsBHMk+5qXN7HzATXgs2wb4L+QWLz4w1DrIFHERf/zvo= 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 1585649356518920.4410675946899; Tue, 31 Mar 2020 03:09:16 -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-205-41gfcX5AO_2U7KqdxlLDOw-1; Tue, 31 Mar 2020 06:09:12 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 451B818A6EC0; Tue, 31 Mar 2020 10:09: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 0ED1F19C6A; Tue, 31 Mar 2020 10:09:07 +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 B432518089D6; Tue, 31 Mar 2020 10:09: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 02VA930h027123 for ; Tue, 31 Mar 2020 06:09:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3D94D1001B28; Tue, 31 Mar 2020 10:09:03 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8996E10002D0; Tue, 31 Mar 2020 10:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585649355; 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=12DFTgIHBkkDc7z9I1DLM3iWy/VUjUeu0ScT3iYG2Og=; b=FllUQgR1Rm01ahIgIYn3CzRvPzEp83Tvyl3Ow22PXHkIZwWCPtNAoI3xSDCdH+1NjBUxwn 2MbX7b42QCV/aJSS5phZpENmV11PuTrW6s5EIABUfrvJQ3EW+Mg1D1C8uTh1RYS3ynRoI+ JVhceySDSur61SqJrzcdGTxBVKk/GYk= X-MC-Unique: 41gfcX5AO_2U7KqdxlLDOw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [virttools-planet PATCH 1/4] Convert README to markdown format Date: Tue, 31 Mar 2020 11:08:50 +0100 Message-Id: <20200331100853.359718-2-berrange@redhat.com> In-Reply-To: <20200331100853.359718-1-berrange@redhat.com> References: <20200331100853.359718-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.84 on 10.5.11.23 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 --- README | 39 --------------------------------------- README.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 39 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index ad388f8..0000000 --- a/README +++ /dev/null @@ -1,39 +0,0 @@ - Virt Tools planet 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)://planet.virttools.org - http(s)://planet.virt-tools.org - -How to add your blog --------------------- -Add a config.ini section for your blog to updater/virt-tools/config.ini: - - [https://example.org/my/blog/feed/] - name =3D John Doe - face =3D jdoe.png - facewidth =3D 96 - faceheight =3D 96 - -Where face (logo image filename), facewidth (logo image width in pixels), = and -faceheight (logo image height in pixels) are optional attributes that desc= ribe -the logo image associated with your blog. Remember to add your image file= into -the updater/virt-tools/images/ directory if you wish to use an image. - -Please send a patch email to libvir-list@redhat.com: - - $ git commit -as - $ git send-email --to libvir-list@redhat.com --cc berrange@redhat.com HE= AD^.. - -How to run the site -------------------- -The site is setup to run under OpenShift - -Initial load can be done with - - oc process -f openshift/templates/virttools-planet.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 planet ho= ok. diff --git a/README.md b/README.md new file mode 100644 index 0000000..68ae162 --- /dev/null +++ b/README.md @@ -0,0 +1,47 @@ +Virt Tools planet 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://planet.virttools.org](http://planet.virttools.org) +* [http://planet.virt-tools.org](http://planet.virt-tools.org) + +How to add your blog +-------------------- +Add a config.ini section for your blog to `updater/virt-tools/config.ini`: + +``` + [https://example.org/my/blog/feed/] + name =3D John Doe + face =3D jdoe.png + facewidth =3D 96 + faceheight =3D 96 +``` + +Where `face` (logo image filename), `facewidth` (logo image width in pixel= s), +and `faceheight` (logo image height in pixels) are optional attributes that +describe the logo image associated with your blog. Remember to add your i= mage +file into the `updater/virt-tools/images/` directory if you wish to use an +image. + +Please send a patch email to `libvir-list@redhat.com`: + +``` + $ git commit -as + $ git send-email --to libvir-list@redhat.com --cc berrange@redhat.com HE= AD^.. +``` + +How to run the site +------------------- + +The site is setup to run under OpenShift + +Initial load can be done with + +``` + oc process -f openshift/templates/virttools-planet.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 planet ho= ok. --=20 2.24.1 From nobody Wed May 8 00:24:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1585649382; cv=none; d=zohomail.com; s=zohoarc; b=hc5FSnWa0cy7Rx6PTB/XPnUwnw5uW5fmSUeZn3JUOp4ieehFylewyEX618KIYCsq2pIHN2HXfqKKHA8/EkGsUSJ5r/1tnxEQEfDPuFMDmksoBR3o35qmn0akpKVRSdYcZindmcfJUHUvWRQ3vtiZUAQBQAhRfGZp1lXRvupKLhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585649382; 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=MGSUVt+rcTtCJXmN3OIUBSiXIo9c/rxP+L9SmpNnMRI=; b=nycohi9Fbd5Bn+k8FTOKfzx0Xe1ELMGSsEgyeHq3r/lMGz9FuSsehdjOWncQCUANDAcrhldTLxzSFiUmaZm/YOlTl1ArbYVSOMRxWBJpU3jouGtYJZJxEaj2IZp3aZyE6tCFo/ri83psZkM6XxtcHtwDriFytCYJ0edXGnRNitE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585649382423871.8661156947087; Tue, 31 Mar 2020 03:09:42 -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-356-qjssLD5QPu-Cqw68itRNvQ-1; Tue, 31 Mar 2020 06:09:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B85F11005509; Tue, 31 Mar 2020 10:09:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 876795D9CA; Tue, 31 Mar 2020 10:09:07 +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 0700886BE8; Tue, 31 Mar 2020 10:09:07 +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 02VA964U027140 for ; Tue, 31 Mar 2020 06:09:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id F2EBB1001B28; Tue, 31 Mar 2020 10:09:05 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1E941001B07; Tue, 31 Mar 2020 10:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585649381; 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=MGSUVt+rcTtCJXmN3OIUBSiXIo9c/rxP+L9SmpNnMRI=; b=b65iqunKgITHOG5TIaCWESrfYzGXKshVqEEEdnX2Is8ns1NmZMiuppALproGS/AZUVsqoH hMpO20gCDdudHWrQx3BMNSvWO3IH+m4iPqBZ7ypmJyAHjRIDQyFd2s0cDpKIiVpuyShutT RWjncMG39tn9Evjxt/gdFKxPNQz3eyk= X-MC-Unique: qjssLD5QPu-Cqw68itRNvQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [virttools-planet PATCH 2/4] Introduce use of GitLab CI for publishing to GitLab Pages Date: Tue, 31 Mar 2020 11:08:51 +0100 Message-Id: <20200331100853.359718-3-berrange@redhat.com> In-Reply-To: <20200331100853.359718-1-berrange@redhat.com> References: <20200331100853.359718-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.14 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 --- .gitlab-ci.yml | 14 ++++++++++++ README.md | 20 +++++++----------- updater/planet-cache.py =3D> planet-cache.py | 0 updater/planet.py =3D> planet.py | 0 {updater/planet =3D> planet}/__init__.py | 0 {updater/planet =3D> planet}/atomstyler.py | 0 {updater/planet =3D> planet}/cache.py | 0 .../compat_logging/__init__.py | 0 .../compat_logging/config.py | 0 .../compat_logging/handlers.py | 0 {updater/planet =3D> planet}/feedparser.py | 0 {updater/planet =3D> planet}/htmltmpl.py | 0 {updater/planet =3D> planet}/sanitize.py | 0 {updater/planet =3D> planet}/tests/__init__.py | 0 .../planet =3D> planet}/tests/test_channel.py | 0 {updater/planet =3D> planet}/tests/test_main.py | 0 .../planet =3D> planet}/tests/test_sanitize.py | 0 {updater/planet =3D> planet}/timeoutsocket.py | 0 .../images/alexbennee.jpeg | Bin .../virt-tools =3D> public}/images/berrange.png | Bin .../virt-tools =3D> public}/images/cole.png | Bin .../images/ehabkost.jpeg | Bin .../images/header-bg.png | Bin .../virt-tools =3D> public}/images/kashyap.jpeg | Bin .../virt-tools =3D> public}/images/logo.png | Bin .../virt-tools =3D> public}/images/logo.xcf | Bin .../virt-tools =3D> public}/images/otubo.png | Bin .../virt-tools =3D> public}/images/qemu.png | Bin .../virt-tools =3D> public}/images/rjones.jpeg | Bin .../virt-tools =3D> public}/images/sgarzare.png | Bin .../virt-tools =3D> public}/images/teuf.png | Bin .../images/thomashuth.png | Bin .../virt-tools =3D> public}/images/ybettan.png | Bin .../virt-tools =3D> public}/images/zeenix.png | Bin updater/app.py | 18 ---------------- .../virt-tools =3D> virt-tools}/atom.xml.tmpl | 0 .../basic/index.html.tmpl | 7 +++--- .../basic/style.css.tmpl | 0 {updater/virt-tools =3D> virt-tools}/config.ini | 4 ++-- .../foafroll.xml.tmpl | 0 .../virt-tools =3D> virt-tools}/opml.xml.tmpl | 0 .../virt-tools =3D> virt-tools}/rss10.xml.tmpl | 0 .../virt-tools =3D> virt-tools}/rss20.xml.tmpl | 0 43 files changed, 27 insertions(+), 36 deletions(-) create mode 100644 .gitlab-ci.yml rename updater/planet-cache.py =3D> planet-cache.py (100%) rename updater/planet.py =3D> planet.py (100%) rename {updater/planet =3D> planet}/__init__.py (100%) rename {updater/planet =3D> planet}/atomstyler.py (100%) rename {updater/planet =3D> planet}/cache.py (100%) rename {updater/planet =3D> planet}/compat_logging/__init__.py (100%) rename {updater/planet =3D> planet}/compat_logging/config.py (100%) rename {updater/planet =3D> planet}/compat_logging/handlers.py (100%) rename {updater/planet =3D> planet}/feedparser.py (100%) rename {updater/planet =3D> planet}/htmltmpl.py (100%) rename {updater/planet =3D> planet}/sanitize.py (100%) rename {updater/planet =3D> planet}/tests/__init__.py (100%) rename {updater/planet =3D> planet}/tests/test_channel.py (100%) rename {updater/planet =3D> planet}/tests/test_main.py (100%) rename {updater/planet =3D> planet}/tests/test_sanitize.py (100%) rename {updater/planet =3D> planet}/timeoutsocket.py (100%) rename {updater/virt-tools =3D> public}/images/alexbennee.jpeg (100%) rename {updater/virt-tools =3D> public}/images/berrange.png (100%) rename {updater/virt-tools =3D> public}/images/cole.png (100%) rename {updater/virt-tools =3D> public}/images/ehabkost.jpeg (100%) rename {updater/virt-tools =3D> public}/images/header-bg.png (100%) rename {updater/virt-tools =3D> public}/images/kashyap.jpeg (100%) rename {updater/virt-tools =3D> public}/images/logo.png (100%) rename {updater/virt-tools =3D> public}/images/logo.xcf (100%) rename {updater/virt-tools =3D> public}/images/otubo.png (100%) rename {updater/virt-tools =3D> public}/images/qemu.png (100%) rename {updater/virt-tools =3D> public}/images/rjones.jpeg (100%) rename {updater/virt-tools =3D> public}/images/sgarzare.png (100%) rename {updater/virt-tools =3D> public}/images/teuf.png (100%) rename {updater/virt-tools =3D> public}/images/thomashuth.png (100%) rename {updater/virt-tools =3D> public}/images/ybettan.png (100%) rename {updater/virt-tools =3D> public}/images/zeenix.png (100%) delete mode 100755 updater/app.py rename {updater/virt-tools =3D> virt-tools}/atom.xml.tmpl (100%) rename {updater/virt-tools =3D> virt-tools}/basic/index.html.tmpl (91%) rename {updater/virt-tools =3D> virt-tools}/basic/style.css.tmpl (100%) rename {updater/virt-tools =3D> virt-tools}/config.ini (98%) rename {updater/virt-tools =3D> virt-tools}/foafroll.xml.tmpl (100%) rename {updater/virt-tools =3D> virt-tools}/opml.xml.tmpl (100%) rename {updater/virt-tools =3D> virt-tools}/rss10.xml.tmpl (100%) rename {updater/virt-tools =3D> virt-tools}/rss20.xml.tmpl (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..cfc6bf6 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,14 @@ + +image: centos:7 + +pages: + stage: build + cache: + paths: + - cache/ + key: "$CI_JOB_NAME" + script: + - python2 planet.py virt-tools/config.ini + artifacts: + paths: + - public diff --git a/README.md b/README.md index 68ae162..034029a 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This directory contains content / configuration for managing =20 How to add your blog -------------------- -Add a config.ini section for your blog to `updater/virt-tools/config.ini`: +Add a config.ini section for your blog to `virt-tools/config.ini`: =20 ``` [https://example.org/my/blog/feed/] @@ -21,8 +21,7 @@ Add a config.ini section for your blog to `updater/virt-t= ools/config.ini`: Where `face` (logo image filename), `facewidth` (logo image width in pixel= s), and `faceheight` (logo image height in pixels) are optional attributes that describe the logo image associated with your blog. Remember to add your i= mage -file into the `updater/virt-tools/images/` directory if you wish to use an -image. +file into the `public/images/` directory if you wish to use an image. =20 Please send a patch email to `libvir-list@redhat.com`: =20 @@ -34,14 +33,11 @@ Please send a patch email to `libvir-list@redhat.com`: How to run the site ------------------- =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 +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. =20 -``` - oc process -f openshift/templates/virttools-planet.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 planet ho= ok. +A scheduled CI pipeline should also be configured to run once an hour to +refresh the blog feeds. diff --git a/updater/planet-cache.py b/planet-cache.py similarity index 100% rename from updater/planet-cache.py rename to planet-cache.py diff --git a/updater/planet.py b/planet.py similarity index 100% rename from updater/planet.py rename to planet.py diff --git a/updater/planet/__init__.py b/planet/__init__.py similarity index 100% rename from updater/planet/__init__.py rename to planet/__init__.py diff --git a/updater/planet/atomstyler.py b/planet/atomstyler.py similarity index 100% rename from updater/planet/atomstyler.py rename to planet/atomstyler.py diff --git a/updater/planet/cache.py b/planet/cache.py similarity index 100% rename from updater/planet/cache.py rename to planet/cache.py diff --git a/updater/planet/compat_logging/__init__.py b/planet/compat_logg= ing/__init__.py similarity index 100% rename from updater/planet/compat_logging/__init__.py rename to planet/compat_logging/__init__.py diff --git a/updater/planet/compat_logging/config.py b/planet/compat_loggin= g/config.py similarity index 100% rename from updater/planet/compat_logging/config.py rename to planet/compat_logging/config.py diff --git a/updater/planet/compat_logging/handlers.py b/planet/compat_logg= ing/handlers.py similarity index 100% rename from updater/planet/compat_logging/handlers.py rename to planet/compat_logging/handlers.py diff --git a/updater/planet/feedparser.py b/planet/feedparser.py similarity index 100% rename from updater/planet/feedparser.py rename to planet/feedparser.py diff --git a/updater/planet/htmltmpl.py b/planet/htmltmpl.py similarity index 100% rename from updater/planet/htmltmpl.py rename to planet/htmltmpl.py diff --git a/updater/planet/sanitize.py b/planet/sanitize.py similarity index 100% rename from updater/planet/sanitize.py rename to planet/sanitize.py diff --git a/updater/planet/tests/__init__.py b/planet/tests/__init__.py similarity index 100% rename from updater/planet/tests/__init__.py rename to planet/tests/__init__.py diff --git a/updater/planet/tests/test_channel.py b/planet/tests/test_chann= el.py similarity index 100% rename from updater/planet/tests/test_channel.py rename to planet/tests/test_channel.py diff --git a/updater/planet/tests/test_main.py b/planet/tests/test_main.py similarity index 100% rename from updater/planet/tests/test_main.py rename to planet/tests/test_main.py diff --git a/updater/planet/tests/test_sanitize.py b/planet/tests/test_sani= tize.py similarity index 100% rename from updater/planet/tests/test_sanitize.py rename to planet/tests/test_sanitize.py diff --git a/updater/planet/timeoutsocket.py b/planet/timeoutsocket.py similarity index 100% rename from updater/planet/timeoutsocket.py rename to planet/timeoutsocket.py diff --git a/updater/virt-tools/images/alexbennee.jpeg b/public/images/alex= bennee.jpeg similarity index 100% rename from updater/virt-tools/images/alexbennee.jpeg rename to public/images/alexbennee.jpeg diff --git a/updater/virt-tools/images/berrange.png b/public/images/berrang= e.png similarity index 100% rename from updater/virt-tools/images/berrange.png rename to public/images/berrange.png diff --git a/updater/virt-tools/images/cole.png b/public/images/cole.png similarity index 100% rename from updater/virt-tools/images/cole.png rename to public/images/cole.png diff --git a/updater/virt-tools/images/ehabkost.jpeg b/public/images/ehabko= st.jpeg similarity index 100% rename from updater/virt-tools/images/ehabkost.jpeg rename to public/images/ehabkost.jpeg diff --git a/updater/virt-tools/images/header-bg.png b/public/images/header= -bg.png similarity index 100% rename from updater/virt-tools/images/header-bg.png rename to public/images/header-bg.png diff --git a/updater/virt-tools/images/kashyap.jpeg b/public/images/kashyap= .jpeg similarity index 100% rename from updater/virt-tools/images/kashyap.jpeg rename to public/images/kashyap.jpeg diff --git a/updater/virt-tools/images/logo.png b/public/images/logo.png similarity index 100% rename from updater/virt-tools/images/logo.png rename to public/images/logo.png diff --git a/updater/virt-tools/images/logo.xcf b/public/images/logo.xcf similarity index 100% rename from updater/virt-tools/images/logo.xcf rename to public/images/logo.xcf diff --git a/updater/virt-tools/images/otubo.png b/public/images/otubo.png similarity index 100% rename from updater/virt-tools/images/otubo.png rename to public/images/otubo.png diff --git a/updater/virt-tools/images/qemu.png b/public/images/qemu.png similarity index 100% rename from updater/virt-tools/images/qemu.png rename to public/images/qemu.png diff --git a/updater/virt-tools/images/rjones.jpeg b/public/images/rjones.j= peg similarity index 100% rename from updater/virt-tools/images/rjones.jpeg rename to public/images/rjones.jpeg diff --git a/updater/virt-tools/images/sgarzare.png b/public/images/sgarzar= e.png similarity index 100% rename from updater/virt-tools/images/sgarzare.png rename to public/images/sgarzare.png diff --git a/updater/virt-tools/images/teuf.png b/public/images/teuf.png similarity index 100% rename from updater/virt-tools/images/teuf.png rename to public/images/teuf.png diff --git a/updater/virt-tools/images/thomashuth.png b/public/images/thoma= shuth.png similarity index 100% rename from updater/virt-tools/images/thomashuth.png rename to public/images/thomashuth.png diff --git a/updater/virt-tools/images/ybettan.png b/public/images/ybettan.= png similarity index 100% rename from updater/virt-tools/images/ybettan.png rename to public/images/ybettan.png diff --git a/updater/virt-tools/images/zeenix.png b/public/images/zeenix.png similarity index 100% rename from updater/virt-tools/images/zeenix.png rename to public/images/zeenix.png diff --git a/updater/app.py b/updater/app.py deleted file mode 100755 index 03b086f..0000000 --- a/updater/app.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/python - -import os -import time - -update =3D "./planet.py ./virt-tools/config.ini" - -os.system("rsync -av virt-tools/images/ /opt/app-root/web/images/") - -while True: - ret =3D os.system(update) - rv =3D ret >> 8 - if rv !=3D 0: - print "Update failed, retrying in 60 seconds" - time.sleep(60) - else: - print "Update succeeded, refreshing in 30 minutes" - time.sleep(30*60) diff --git a/updater/virt-tools/atom.xml.tmpl b/virt-tools/atom.xml.tmpl similarity index 100% rename from updater/virt-tools/atom.xml.tmpl rename to virt-tools/atom.xml.tmpl diff --git a/updater/virt-tools/basic/index.html.tmpl b/virt-tools/basic/in= dex.html.tmpl similarity index 91% rename from updater/virt-tools/basic/index.html.tmpl rename to virt-tools/basic/index.html.tmpl index d26aba0..93eb88f 100644 --- a/updater/virt-tools/basic/index.html.tmpl +++ b/virt-tools/basic/index.html.tmpl @@ -23,7 +23,7 @@
  • " title=3D""> ">(feed)
    •  -
  • Add your blog!
    • +
  • Add your blog!
    • =20 @@ -73,9 +73,8 @@
    Powered by Planet!
    Last updated: -
    - 3D"Powered -     + &emdash; + Edit this page
    =20