diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 2e3b6384cb..8e60810751 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -60,3 +60,6 @@ - role: developer/website website: developer.fedoraproject.org + + - role: fedoraloveskde/website + website: fedoraloveskde.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 40771b6f43..2595ee883c 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -616,6 +616,14 @@ sslonly: true cert_name: "{{wildcard_cert_name}}" + - role: httpd/website + site_name: fedoraloveskde.org + server_aliases: [stg.fedoraloveskde.org] + sslonly: true + certbot: true + tags: + - fedoraloveskde + - role: httpd/website site_name: osbs.fedoraproject.org server_aliases: [osbs.stg.fedoraproject.org] diff --git a/playbooks/manual/rebuild/websites.yml b/playbooks/manual/rebuild/websites.yml index d1400ab7f4..74972d73fc 100644 --- a/playbooks/manual/rebuild/websites.yml +++ b/playbooks/manual/rebuild/websites.yml @@ -34,3 +34,4 @@ - spins.fedoraproject.org - start.fedoraproject.org - budget.fedoraproject.org + - fedoraloveskde.org diff --git a/roles/dns/files/zones.conf b/roles/dns/files/zones.conf index b39a275c9d..3119c5b074 100644 --- a/roles/dns/files/zones.conf +++ b/roles/dns/files/zones.conf @@ -392,6 +392,11 @@ zone "fedoraplayground.com" { file "/var/named/master/built/fedoraplayground.com"; }; +zone "fedoraloveskde.org" { + type master; + file "/var/named/master/built/fedoraloveskde.org"; +}; + zone "1.0.0.3.0.9.0.3.8.2.0.0.0.1.6.2.ip6.arpa" { type master; file "/var/named/master/built/1.0.0.3.0.9.0.3.8.2.0.0.0.1.6.2.ip6.arpa"; diff --git a/roles/fedoraloveskde/build/files/syncfedoraloveskde.cron b/roles/fedoraloveskde/build/files/syncfedoraloveskde.cron new file mode 100644 index 0000000000..d846a52f61 --- /dev/null +++ b/roles/fedoraloveskde/build/files/syncfedoraloveskde.cron @@ -0,0 +1,2 @@ +MAILTO=web-members@fedoraproject.org +25 * * * * apache /usr/local/bin/lock-wrapper synckdelovesfedora /usr/local/bin/synckdelovesfedora diff --git a/roles/fedoraloveskde/build/files/syncfedoraloveskde.sh b/roles/fedoraloveskde/build/files/syncfedoraloveskde.sh new file mode 100644 index 0000000000..7d8a065319 --- /dev/null +++ b/roles/fedoraloveskde/build/files/syncfedoraloveskde.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ ! -d /srv/web/fedoraloveskde.org/.git ] +then + /usr/bin/git clone -q https://pagure.io/fedora-kde/fedoraloveskde.org /srv/web/fedoraloveskde.org +fi + +cd /srv/web/fedoraloveskde.org + +/usr/bin/git clean -q -fdx || exit 1 +/usr/bin/git reset -q --hard || exit 1 +/usr/bin/git checkout -q production || exit 1 +/usr/bin/git pull -q --ff-only || exit 1 diff --git a/roles/fedoraloveskde/build/files/syncfedoraloveskde.stg.sh b/roles/fedoraloveskde/build/files/syncfedoraloveskde.stg.sh new file mode 100644 index 0000000000..dda344add3 --- /dev/null +++ b/roles/fedoraloveskde/build/files/syncfedoraloveskde.stg.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ ! -d /srv/web/fedoraloveskde.org/.git ] +then + /usr/bin/git clone -q https://pagure.io/fedora-kde/fedoraloveskde.org /srv/web/fedoraloveskde.org +fi + +cd /srv/web/fedoraloveskde.org + +/usr/bin/git clean -q -fdx || exit 1 +/usr/bin/git reset -q --hard || exit 1 +/usr/bin/git checkout -q staging || exit 1 +/usr/bin/git pull -q --ff-only || exit 1 diff --git a/roles/fedoraloveskde/build/tasks/main.yml b/roles/fedoraloveskde/build/tasks/main.yml new file mode 100644 index 0000000000..aa7c2539b3 --- /dev/null +++ b/roles/fedoraloveskde/build/tasks/main.yml @@ -0,0 +1,35 @@ +- 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: + - fedoraloveskde.org + tags: + - fedoraloveskde + +- name: Copy syncfedoraloveskde script (stg) + when: env == "staging" + copy: > + src=syncfedoraloveskde.stg.sh dest=/usr/local/bin/syncfedoraloveskde owner=root group=root + mode=0755 + tags: + - fedoraloveskde + +- name: Copy syncfedoraloveskde script (prod) + when: env == "production" + copy: > + src=syncfedoraloveskde.sh dest=/usr/local/bin/syncfedoraloveskde owner=root group=root + mode=0755 + tags: + - fedoraloveskde + +- name: Install the syncfedoraloveskde cron job + copy: > + src={{item}}.cron dest=/etc/cron.d/{{item}}.cron + owner=root group=root mode=0644 + with_items: + - syncfedoraloveskde + tags: + - fedoraloveskde + - cron diff --git a/roles/fedoraloveskde/website/files/cron-sync-fedoraloveskde b/roles/fedoraloveskde/website/files/cron-sync-fedoraloveskde new file mode 100644 index 0000000000..7641c246a8 --- /dev/null +++ b/roles/fedoraloveskde/website/files/cron-sync-fedoraloveskde @@ -0,0 +1 @@ +30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group --delete-excluded --exclude='.git*' sundries01::fedoraloveskde.org/ /srv/web/fedoraloveskde.org/ diff --git a/roles/fedoraloveskde/website/files/fedoraloveskde.conf b/roles/fedoraloveskde/website/files/fedoraloveskde.conf new file mode 100644 index 0000000000..a010e076a1 --- /dev/null +++ b/roles/fedoraloveskde/website/files/fedoraloveskde.conf @@ -0,0 +1,8 @@ +DocumentRoot /srv/web/fedoraloveskde.org + +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/fedoraloveskde/website/tasks/main.yml b/roles/fedoraloveskde/website/tasks/main.yml new file mode 100644 index 0000000000..5a1317431d --- /dev/null +++ b/roles/fedoraloveskde/website/tasks/main.yml @@ -0,0 +1,15 @@ +- name: Copy in the sync-fedoraloveskde cronjob + copy: src=cron-sync-fedoraloveskde dest=/etc/cron.d/sync-fedoraloveskde + tags: + - fedoraloveskde + +- 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: + - fedoraloveskde.conf + notify: + - reload proxyhttpd + tags: + - fedoraloveskde diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index e79a658f07..b9b8a09727 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -213,3 +213,11 @@ 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 + +[fedoraloveskde.org] +comment = fedoraloveskde.org +path = /srv/web/fedoraloveskde.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 ae5172a79f..7b09707e09 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -213,3 +213,11 @@ 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 10.3.160.0/255.255.224.0 + +[fedoraloveskde.org] +comment = fedoraloveskde.org +path = /srv/web/fedoraloveskde.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 dc3f2a79e5..522e716524 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 arm.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 " +SITES="admin.fedoraproject.org apps.fedoraproject.org arm.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