From 3a79d455969844893a60a9a499bc266bbb2923ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 13 Jun 2023 10:06:45 +0200 Subject: [PATCH] Remove standalone Kinoite website Replaced by https://fedoraproject.org/kinoite/ Needs: https://pagure.io/fedora-infra/ansible/pull-request/1479 --- playbooks/groups/sundries.yml | 2 - playbooks/include/proxies-fedora-web.yml | 3 -- .../kinoite/build/files/synckinoite.cron | 2 - .../kinoite/build/files/synckinoite.sh | 12 ----- .../kinoite/build/files/synckinoite.stg.sh | 12 ----- roles/fedora-web/kinoite/build/tasks/main.yml | 52 ------------------- .../kinoite/website/files/cron-sync-kinoite | 1 - .../files/kinoite.fedoraproject.org.conf | 8 --- .../fedora-web/kinoite/website/tasks/main.yml | 22 -------- roles/rsyncd/files/rsyncd.conf.sundries | 8 --- roles/rsyncd/files/rsyncd.conf.sundries-stg | 8 --- .../files/run-daily-awstats.sh | 2 +- 12 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 roles/fedora-web/kinoite/build/files/synckinoite.cron delete mode 100644 roles/fedora-web/kinoite/build/files/synckinoite.sh delete mode 100644 roles/fedora-web/kinoite/build/files/synckinoite.stg.sh delete mode 100644 roles/fedora-web/kinoite/build/tasks/main.yml delete mode 100644 roles/fedora-web/kinoite/website/files/cron-sync-kinoite delete mode 100644 roles/fedora-web/kinoite/website/files/kinoite.fedoraproject.org.conf delete mode 100644 roles/fedora-web/kinoite/website/tasks/main.yml diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 8bc2c11ff7..b3e1faa386 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -55,8 +55,6 @@ when: master_sundries_node|bool - role: fedoraloveskde/build when: master_sundries_node|bool - - role: fedora-web/kinoite/build - when: master_sundries_node|bool - role: rabbit/user username: "sundries{{ env_suffix }}" sent_topics: ^$ diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 53be4b53dd..b035d44cdd 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -61,6 +61,3 @@ - role: fedora-web/fedora.im website: fedora.im - - - role: fedora-web/kinoite/website - website: kinoite.fedoraproject.org diff --git a/roles/fedora-web/kinoite/build/files/synckinoite.cron b/roles/fedora-web/kinoite/build/files/synckinoite.cron deleted file mode 100644 index 55dd9107e4..0000000000 --- a/roles/fedora-web/kinoite/build/files/synckinoite.cron +++ /dev/null @@ -1,2 +0,0 @@ -MAILTO=web-members@fedoraproject.org -25 * * * * apache /usr/local/bin/lock-wrapper synckinoite /usr/local/bin/synckinoite diff --git a/roles/fedora-web/kinoite/build/files/synckinoite.sh b/roles/fedora-web/kinoite/build/files/synckinoite.sh deleted file mode 100644 index ce98435804..0000000000 --- a/roles/fedora-web/kinoite/build/files/synckinoite.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [ ! -d /srv/web/kinoite.fedoraproject.org/.git ] -then - /usr/bin/git clone -q https://pagure.io/fedora-kde/kinoite-site /srv/web/kinoite.fedoraproject.org -fi - -cd /srv/web/kinoite.fedoraproject.org - -/usr/bin/git clean -q -fdx || exit 1 -/usr/bin/git fetch -q || exit 1 -/usr/bin/git reset -q --hard origin/production || exit 1 diff --git a/roles/fedora-web/kinoite/build/files/synckinoite.stg.sh b/roles/fedora-web/kinoite/build/files/synckinoite.stg.sh deleted file mode 100644 index 54803cf60a..0000000000 --- a/roles/fedora-web/kinoite/build/files/synckinoite.stg.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [ ! -d /srv/web/kinoite.fedoraproject.org/.git ] -then - /usr/bin/git clone -q https://pagure.io/fedora-kde/kinoite-site /srv/web/kinoite.fedoraproject.org -fi - -cd /srv/web/kinoite.fedoraproject.org - -/usr/bin/git clean -q -fdx || exit 1 -/usr/bin/git fetch -q || exit 1 -/usr/bin/git reset -q --hard origin/staging || exit 1 diff --git a/roles/fedora-web/kinoite/build/tasks/main.yml b/roles/fedora-web/kinoite/build/tasks/main.yml deleted file mode 100644 index e7251bdce1..0000000000 --- a/roles/fedora-web/kinoite/build/tasks/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -- name: Create directories - file: - state: directory - path: "/srv/web/{{item}}" - owner: apache - group: apache - mode: 0755 - setype: httpd_sys_content_t - seuser: system_u - with_items: - - kinoite.fedoraproject.org - tags: - - kinoite - -- name: Copy synckinoite script (stg) - when: env == "staging" - copy: - src: sync{{item}}.stg.sh - dest: /usr/local/bin/sync{{item}} - owner: root - group: root - mode: 0755 - with_items: - - kinoite - tags: - - kinoite - -- name: Copy synckinoite script (prod) - when: env == "production" - copy: - src: "{{item}}.sh" - dest: "/usr/local/bin/{{item}}" - owner: root - group: root - mode: 0755 - with_items: - - synckinoite - tags: - - kinoite - -- name: Install the synckinoite cron job - copy: - src: "{{item}}.cron" - dest: "/etc/cron.d/{{item}}.cron" - owner: root - group: root - mode: 0644 - with_items: - - synckinoite - tags: - - kinoite - - cron diff --git a/roles/fedora-web/kinoite/website/files/cron-sync-kinoite b/roles/fedora-web/kinoite/website/files/cron-sync-kinoite deleted file mode 100644 index 7b33748072..0000000000 --- a/roles/fedora-web/kinoite/website/files/cron-sync-kinoite +++ /dev/null @@ -1 +0,0 @@ -30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group --delete-excluded --exclude='.git*' sundries01::kinoite.fedoraproject.org/ /srv/web/kinoite.fedoraproject.org/ diff --git a/roles/fedora-web/kinoite/website/files/kinoite.fedoraproject.org.conf b/roles/fedora-web/kinoite/website/files/kinoite.fedoraproject.org.conf deleted file mode 100644 index b7506ae7d7..0000000000 --- a/roles/fedora-web/kinoite/website/files/kinoite.fedoraproject.org.conf +++ /dev/null @@ -1,8 +0,0 @@ -DocumentRoot /srv/web/kinoite.fedoraproject.org/public - -AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript - -FileETag MTime Size - -ExpiresActive On -ExpiresDefault "access plus 30 minutes" diff --git a/roles/fedora-web/kinoite/website/tasks/main.yml b/roles/fedora-web/kinoite/website/tasks/main.yml deleted file mode 100644 index 241c338c64..0000000000 --- a/roles/fedora-web/kinoite/website/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ -- name: Copy in the sync-kinoite cronjob - copy: - src: "cron-sync-{{item}}" - dest: "/etc/cron.d/sync-{{item}}" - with_items: - - kinoite - tags: - - kinoite - -- name: Copy some config files for {{website}} - copy: - src: "{{item}}" - dest: "/etc/httpd/conf.d/{{website}}/{{item}}" - owner: root - group: root - mode: 0644 - with_items: - - kinoite.fedoraproject.org.conf - notify: - - reload proxyhttpd - tags: - - kinoite diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 09a1b0aebd..a20506d7be 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -205,11 +205,3 @@ uid = root gid = root read only = yes hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 - -[kinoite.fedoraproject.org] -comment = kinoite.fedoraproject.org -path = /srv/web/kinoite.fedoraproject.org -uid = root -gid = root -read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index dac5a8e4e4..52b5cda3f5 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -205,11 +205,3 @@ uid = root gid = root read only = yes hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 - -[kinoite.fedoraproject.org] -comment = kinoite.fedoraproject.org -path = /srv/web/kinoite.fedoraproject.org -uid = root -gid = root -read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 diff --git a/roles/web-data-analysis/files/run-daily-awstats.sh b/roles/web-data-analysis/files/run-daily-awstats.sh index 0ef73dcf32..d985fde63f 100644 --- a/roles/web-data-analysis/files/run-daily-awstats.sh +++ b/roles/web-data-analysis/files/run-daily-awstats.sh @@ -44,7 +44,7 @@ TREEDIR=${LOGDIR}/${YEAR}/${MONTH}/${DAY} AWSTATS=/usr/share/awstats/wwwroot/cgi-bin/awstats.pl HTMLDOC=/usr/bin/htmldoc -SITES="admin.fedoraproject.org apps.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org docs.fedoraproject.org docs-old.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org fedoraloveskde.org kinoite.fedoraproject.org" +SITES="admin.fedoraproject.org apps.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org docs.fedoraproject.org docs-old.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org fedoraloveskde.org" pushd ${CONFDIR} for SITE in ${SITES}; do