forked from infra/ansible
docs: remove docs-old
This commit is contained in:
kevin
parent
3437042944
commit
9000dd6def
12 changed files with 6 additions and 105 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -283,13 +283,6 @@
|
|||
gzip: true
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
10 * * * * root /usr/local/bin/lock-wrapper olddocssync /usr/local/bin/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/
|
||||
|
|
@ -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]
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue