From 23eadcbb0c0e93002983ec51a119554823c44e28 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 8 Jan 2019 20:15:10 +0000 Subject: [PATCH] whatcanidoforfedora: move prod over to openshift as well. Signed-off-by: Kevin Fenzi --- playbooks/groups/sundries.yml | 2 - playbooks/include/proxies-fedora-web.yml | 2 - playbooks/include/proxies-reverseproxy.yml | 1 - .../files/cron-sync-whatcanidoforfedora | 1 - .../whatcanidoforfedora/tasks/main.yml | 17 -------- .../templates/whatcanidoforfedora-web.conf | 13 ------ roles/rsyncd/files/rsyncd.conf.sundries | 8 ---- roles/rsyncd/files/rsyncd.conf.sundries-stg | 8 ---- .../build/files/sync-wcidff.cron | 2 - .../build/files/sync-wcidff.sh | 31 -------------- .../whatcanidoforfedora/build/tasks/main.yml | 41 ------------------- 11 files changed, 126 deletions(-) delete mode 100644 roles/fedora-web/whatcanidoforfedora/files/cron-sync-whatcanidoforfedora delete mode 100644 roles/fedora-web/whatcanidoforfedora/tasks/main.yml delete mode 100644 roles/fedora-web/whatcanidoforfedora/templates/whatcanidoforfedora-web.conf delete mode 100644 roles/whatcanidoforfedora/build/files/sync-wcidff.cron delete mode 100644 roles/whatcanidoforfedora/build/files/sync-wcidff.sh delete mode 100644 roles/whatcanidoforfedora/build/tasks/main.yml diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index a2ad015df4..c78096caa6 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -51,8 +51,6 @@ when: master_sundries_node - role: developer/build when: master_sundries_node - - role: whatcanidoforfedora/build - when: master_sundries_node - role: fedmsg/base when: master_sundries_node diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 1eab95a58d..3ef1e22178 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -52,8 +52,6 @@ website: alt.fedoraproject.org - role: fedora-web/src website: src.fedoraproject.org - - role: fedora-web/whatcanidoforfedora - website: whatcanidoforfedora.org # Some other static content, not strictly part of "fedora-web" goes below here - role: fedora-budget/proxy diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 7ed30fd061..cacaaedd5f 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -724,7 +724,6 @@ targettype: openshift keephost: true tags: whatcanidoforfedora.org - when: env == "staging" - role: httpd/reverseproxy website: fpdc.fedoraproject.org diff --git a/roles/fedora-web/whatcanidoforfedora/files/cron-sync-whatcanidoforfedora b/roles/fedora-web/whatcanidoforfedora/files/cron-sync-whatcanidoforfedora deleted file mode 100644 index 475310a7d7..0000000000 --- a/roles/fedora-web/whatcanidoforfedora/files/cron-sync-whatcanidoforfedora +++ /dev/null @@ -1 +0,0 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::whatcanidoforfedora.org/ /srv/web/whatcanidoforfedora.org/ diff --git a/roles/fedora-web/whatcanidoforfedora/tasks/main.yml b/roles/fedora-web/whatcanidoforfedora/tasks/main.yml deleted file mode 100644 index 90cbd7e680..0000000000 --- a/roles/fedora-web/whatcanidoforfedora/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -- name: Copy some config files for {{website}} - template: > - src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} - owner=root group=root mode=0644 - with_items: - - whatcanidoforfedora-web.conf - notify: - - reload proxyhttpd - tags: - - fedora-web - - fedora-web/whatcanidoforfedora - -- name: Copy in the sync-whatcanidoforfedora cronjob - copy: src=cron-sync-whatcanidoforfedora dest=/etc/cron.d/sync-whatcanidoforfedora - tags: - - fedora-web - - fedora-web/whatcanidoforfedora diff --git a/roles/fedora-web/whatcanidoforfedora/templates/whatcanidoforfedora-web.conf b/roles/fedora-web/whatcanidoforfedora/templates/whatcanidoforfedora-web.conf deleted file mode 100644 index 3c1259ebae..0000000000 --- a/roles/fedora-web/whatcanidoforfedora/templates/whatcanidoforfedora-web.conf +++ /dev/null @@ -1,13 +0,0 @@ -DocumentRoot /srv/web/whatcanidoforfedora.org -Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico - -AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript - -FileETag MTime Size - -ExpiresActive On -ExpiresDefault "access plus 30 minutes" - -RewriteEngine On -RewriteRule "^/$" "/en/" [R] -RewriteRule "^/index.html$" "/en/" [R] diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 0d436f3dd6..f6fe92e4ff 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -134,14 +134,6 @@ gid = root read only = yes hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 -[whatcanidoforfedora.org] -comment = whatcanidoforfedora.org -path = /srv/web/whatcanidoforfedora.org -uid = root -gid = root -read only = yes -hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 - [labs.fedoraproject.org] comment = labs.fedoraproject.org path = /srv/web/labs.fedoraproject.org diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index 0d436f3dd6..f6fe92e4ff 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -134,14 +134,6 @@ gid = root read only = yes hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 -[whatcanidoforfedora.org] -comment = whatcanidoforfedora.org -path = /srv/web/whatcanidoforfedora.org -uid = root -gid = root -read only = yes -hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 - [labs.fedoraproject.org] comment = labs.fedoraproject.org path = /srv/web/labs.fedoraproject.org diff --git a/roles/whatcanidoforfedora/build/files/sync-wcidff.cron b/roles/whatcanidoforfedora/build/files/sync-wcidff.cron deleted file mode 100644 index d7932f1711..0000000000 --- a/roles/whatcanidoforfedora/build/files/sync-wcidff.cron +++ /dev/null @@ -1,2 +0,0 @@ -MAILTO=web-members@fedoraproject.org -15 * * * * apache /usr/local/bin/lock-wrapper sync-wcidff /usr/local/bin/sync-wcidff.sh diff --git a/roles/whatcanidoforfedora/build/files/sync-wcidff.sh b/roles/whatcanidoforfedora/build/files/sync-wcidff.sh deleted file mode 100644 index 280227430e..0000000000 --- a/roles/whatcanidoforfedora/build/files/sync-wcidff.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# Borrowed heavily from the syncStatic cronjob script. - -if [ ! -d /srv/web/asknot-ng/.git ] -then - /usr/bin/git clone -q \ - https://github.com/fedora-infra/asknot-ng.git \ - /srv/web/asknot-ng -fi - -cd /srv/web/asknot-ng - -/usr/bin/git clean -q -fdx || exit 1 -/usr/bin/git reset -q --hard || exit 1 -/usr/bin/git checkout -q develop || exit 1 -/usr/bin/git pull -q --ff-only || exit 1 - -err=$( - { - ./build.sh &&\ - rsync -qa --delete-after --delay-updates build/ "/srv/web/whatcanidoforfedora.org/"; \ - } 2>&1 -) - -rc=$? -if [ $rc -ne 0 ]; then - echo "whatcanidoforfedora.org build failed" - echo "====================================" - echo "$err" - echo -fi diff --git a/roles/whatcanidoforfedora/build/tasks/main.yml b/roles/whatcanidoforfedora/build/tasks/main.yml deleted file mode 100644 index 998857d427..0000000000 --- a/roles/whatcanidoforfedora/build/tasks/main.yml +++ /dev/null @@ -1,41 +0,0 @@ -- name: Install needed packages - package: name={{ item }} state=present - with_items: - - PyYAML - - git - - python-mako - tags: - - packages - - whatcanidoforfedora - -- 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: - - whatcanidoforfedora.org - tags: - - whatcanidoforfedora - -- name: Copy sync-wcidff.sh script - copy: - src: sync-wcidff.sh - dest: /usr/local/bin/sync-wcidff.sh - owner: root - group: root - mode: 0755 - tags: - - whatcanidoforfedora - - cron - -- name: Install the sync-wcidff cronjob - copy: - src: sync-wcidff.cron - dest: /etc/cron.d/sync-wcidff.cron - owner: root - group: root - mode: 0644 - tags: - - whatcanidoforfedora - - cron