From 9000dd6def734978581a6228524fa78eb482b1fc Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Dec 05 2022 22:08:18 +0000 Subject: docs: remove docs-old --- diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index e2346fd..2eec4c6 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -55,9 +55,6 @@ - role: fedora-docs/proxy website: docs.fedoraproject.org - - role: fedora-docs-old/proxy - website: docs-old.fedoraproject.org - - role: developer/website website: developer.fedoraproject.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 27d4131..65c7688 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -284,13 +284,6 @@ cert_name: "{{wildcard_cert_name}}" - role: httpd/website - site_name: docs-old.fedoraproject.org - server_aliases: - - docs-old.stg.fedoraproject.org - sslonly: true - cert_name: "{{wildcard_cert_name}}" - - - role: httpd/website site_name: bodhi.fedoraproject.org sslonly: true server_aliases: [bodhi.stg.fedoraproject.org] diff --git a/roles/fedora-docs-old/proxy/files/cron-docs-old-rsync b/roles/fedora-docs-old/proxy/files/cron-docs-old-rsync deleted file mode 100644 index a7a55fd..0000000 --- a/roles/fedora-docs-old/proxy/files/cron-docs-old-rsync +++ /dev/null @@ -1 +0,0 @@ -10 * * * * root /usr/local/bin/lock-wrapper olddocssync /usr/local/bin/docs-old-rsync >/dev/null diff --git a/roles/fedora-docs-old/proxy/files/docs-old-rsync b/roles/fedora-docs-old/proxy/files/docs-old-rsync deleted file mode 100755 index ff64cd6..0000000 --- a/roles/fedora-docs-old/proxy/files/docs-old-rsync +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ sundries01::docs-old/ /srv/web/docs-old.fedoraproject.org/ diff --git a/roles/fedora-docs-old/proxy/files/fedora-docs-old.conf b/roles/fedora-docs-old/proxy/files/fedora-docs-old.conf deleted file mode 100644 index 0760a35..0000000 --- a/roles/fedora-docs-old/proxy/files/fedora-docs-old.conf +++ /dev/null @@ -1,22 +0,0 @@ -DocumentRoot /srv/web/docs-old.fedoraproject.org/public_html -ErrorDocument 404 http://docs-old.fedoraproject.org/ - -AddType application/epub+zip .epub -AddType image/svg+xml .svg -AddType image/svg+xml .svgz -AddEncoding gzip .svgz - - - mod_gzip_on No - - - -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 ^(.*)$ http://docs.fedoraproject.org/$1 [R=301,L] diff --git a/roles/fedora-docs-old/proxy/tasks/main.yml b/roles/fedora-docs-old/proxy/tasks/main.yml deleted file mode 100644 index a2ff22e..0000000 --- a/roles/fedora-docs-old/proxy/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ -- copy: > - src=docs-old-rsync dest=/usr/local/bin/docs-old-rsync - owner=root group=root mode=0755 - tags: - - fedora-docs-old - - fedora-docs-old/proxy - -- copy: > - src=cron-docs-old-rsync dest=/etc/cron.d/docs-old-rsync - owner=root group=root mode=0644 - tags: - - fedora-docs-old - - fedora-docs-old/proxy - -- copy: > - src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} - owner=root group=root mode=0644 - with_items: - - fedora-docs-old.conf - notify: - - reload proxyhttpd - tags: - - fedora-docs-old - - fedora-docs-old/proxy diff --git a/roles/fedora-docs/build/tasks/main.yml b/roles/fedora-docs/build/tasks/main.yml index 5d0d1c0..d13bd20 100644 --- a/roles/fedora-docs/build/tasks/main.yml +++ b/roles/fedora-docs/build/tasks/main.yml @@ -1,5 +1,3 @@ -- file: dest=/srv/web/docs state=directory - - template: > src=docs-sync.j2 dest=/usr/local/bin/docs-sync owner=root group=root mode=0755 diff --git a/roles/fedora-docs/build/templates/docs-sync.j2 b/roles/fedora-docs/build/templates/docs-sync.j2 index 0a6d67a..2bd30e0 100755 --- a/roles/fedora-docs/build/templates/docs-sync.j2 +++ b/roles/fedora-docs/build/templates/docs-sync.j2 @@ -1,26 +1,5 @@ #!/bin/sh -if [ ! -d /srv/web/docs ] -then - echo "/srv/web/docs missing" - cd /srv/web -{% if env == 'staging' %} - git clone https://pagure.io/fedora-docs/fedora-docs-web.git docs -{% else %} - git clone https://pagure.io/fedora-docs/fedora-docs-web.git docs -{% endif %} -fi - - -cd /srv/web/docs -/usr/bin/git reset -q --hard -{% if env == 'staging' %} -/usr/bin/git checkout -q stg -{% else %} -/usr/bin/git checkout -q prod -{% endif %} -/usr/bin/git pull -q --ff-only - if [ ! -d /srv/web/docs-redirects ] then echo "/srv/web/docs-redirects missing" diff --git a/roles/fedora-docs/proxy/files/docs-rsync b/roles/fedora-docs/proxy/files/docs-rsync index bd4fba5..68378a5 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync +++ b/roles/fedora-docs/proxy/files/docs-rsync @@ -1,9 +1,9 @@ #!/bin/sh -/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs-redirects/ --link-dest /srv/web/docs-old.fedoraproject.org/public_html/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ -/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs.fedoraproject.org --link-dest /srv/web/docs-old.fedoraproject.org/public_html/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs-redirects/ /srv/web/docs-redirects/ +/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs-redirects/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ +/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs.fedoraproject.org --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs-redirects/ /srv/web/docs-redirects/ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130 -rsync --timeout 300 -aH --delete --delete-after --delete-excluded --exclude='.git*' /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ +rsync --timeout 300 -aH --delete --delete-after --delete-excluded --exclude='.git*' /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-combined/ diff --git a/roles/fedora-docs/proxy/files/docs-rsync.stg b/roles/fedora-docs/proxy/files/docs-rsync.stg index bd4fba5..f9c4203 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync.stg +++ b/roles/fedora-docs/proxy/files/docs-rsync.stg @@ -1,9 +1,9 @@ #!/bin/sh -/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs-redirects/ --link-dest /srv/web/docs-old.fedoraproject.org/public_html/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ -/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs.fedoraproject.org --link-dest /srv/web/docs-old.fedoraproject.org/public_html/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs-redirects/ /srv/web/docs-redirects/ +/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs-redirects/ --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ +/usr/bin/rsync --timeout 300 -aH --link-dest /srv/web/docs.fedoraproject.org --link-dest /srv/web/docs-combined/ --delete --delete-excluded --delete-after --exclude=.git --exclude='copying.tmp/' sundries01::docs-redirects/ /srv/web/docs-redirects/ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130 -rsync --timeout 300 -aH --delete --delete-after --delete-excluded --exclude='.git*' /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ +rsync --timeout 300 -aH --delete --delete-after --delete-excluded --exclude='.git*' /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-combined/ diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 76983d5..083c44f 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -14,14 +14,6 @@ gid = root read only = yes hosts allow = 10.3.163.39 192.168.1.59 -[docs-old] -comment = Old Docs Site -path = /srv/web/docs-old -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 - [docs] comment = Docs Site path = /srv/docs diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index f6164dc..fd85418 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -14,14 +14,6 @@ gid = root read only = yes hosts allow = 10.5.126.13 192.168.1.59 10.3.163.39 -[docs-old] -comment = Old Docs Site -path = /srv/web/docs-old -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 - [docs] comment = Docs Site path = /srv/docs