fedora-infra / ansible

Clone
Source Code
GIT

#1257 docs: remove docs-old
Merged a year ago by kevin. Opened a year ago by darknao.
fedora-infra/ darknao/ansible remove_docs  into  main

file modified
-3 
@@ -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

file modified
-7 
@@ -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]

file removed
-1 
@@ -1,1 +0,0 @@ 
 

- 10 * * * * root /usr/local/bin/lock-wrapper olddocssync /usr/local/bin/docs-old-rsync >/dev/null

file removed
-3 
@@ -1,3 +0,0 @@ 
 

- #!/bin/sh                                                                                  

- 

- /usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ sundries01::docs-old/ /srv/web/docs-old.fedoraproject.org/

file removed
-22 
@@ -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
 

- <FilesMatch \.svgz$>
 

-   <IfModule mod_gzip.c>
 

-     mod_gzip_on No
 

-   </IfModule>
 

- </FilesMatch>
 

- 

- 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]

file removed
-24 
@@ -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

file modified
-2 
@@ -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

file modified
-21 
@@ -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"

file modified
+3 -3 
@@ -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/

file modified
+3 -3 
@@ -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/

file modified
-8 
@@ -14,14 +14,6 @@ 
 

  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

file modified
-8 
@@ -14,14 +14,6 @@ 
 

  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

The old docs are no longer linked on docs.fp-o. We can finally remove it for good.

There are a few things that need to be removed manually on proxies / sundries:

proxies:

  • /usr/local/bin/docs-old-rsync
  • /etc/cron.d/docs-old-rsync
  • /etc/httpd/conf.d/docs-old.fedoraproject.org.conf
  • /etc/httpd/conf.d/docs-old.fedoraproject.org
  • /srv/web/docs-old.fedoraproject.org

sundries:

  • /srv/web/docs
  • /srv/web/docs-old

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto b3709f9eba26fe5e87dd33c99a0fd4159e932afb
a year ago

rebased onto b3709f9eba26fe5e87dd33c99a0fd4159e932afb
a year ago

Build succeeded.

rebased onto 895b2855f4fb53dc100bdd1330540eec07b3949e
a year ago

rebased onto 895b2855f4fb53dc100bdd1330540eec07b3949e
a year ago

Build succeeded.

rebased onto 9000dd6
a year ago

rebased onto 9000dd6
a year ago

Build succeeded.

Pull-Request has been merged by kevin
a year ago
Metadata
None
No Tags
Changes Summary 12
+0 -3
file changed
playbooks/include/proxies-fedora-web.yml
+0 -7
file changed
playbooks/include/proxies-websites.yml
-1
file removed
roles/fedora-docs-old/proxy/files/cron-docs-old-rsync
-3
file removed
roles/fedora-docs-old/proxy/files/docs-old-rsync
-22
file removed
roles/fedora-docs-old/proxy/files/fedora-docs-old.conf
-24
file removed
roles/fedora-docs-old/proxy/tasks/main.yml
+0 -2
file changed
roles/fedora-docs/build/tasks/main.yml
+0 -21
file changed
roles/fedora-docs/build/templates/docs-sync.j2
+3 -3
file changed
roles/fedora-docs/proxy/files/docs-rsync
+3 -3
file changed
roles/fedora-docs/proxy/files/docs-rsync.stg
+0 -8
file changed
roles/rsyncd/files/rsyncd.conf.sundries
+0 -8
file changed
roles/rsyncd/files/rsyncd.conf.sundries-stg
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.