summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2017-08-24 22:52:09 +0000
committerKevin Fenzi <kevin@scrye.com>2017-08-24 22:52:09 +0000
commit82e49d55230d2e60a567dd93594cd825cfa366a9 (patch)
treeba81547a448e96bef6ed62266b933fdc025ad4f8
parentf0e03bd7e92f0e8cee3957f88dc16a418f518231 (diff)
downloadansible-82e49d55230d2e60a567dd93594cd825cfa366a9.tar.gz
ansible-82e49d55230d2e60a567dd93594cd825cfa366a9.tar.xz
ansible-82e49d55230d2e60a567dd93594cd825cfa366a9.zip
Create a docs-old website.
-rw-r--r--playbooks/include/proxies-fedora-web.yml3
-rw-r--r--playbooks/include/proxies-websites.yml7
-rw-r--r--roles/fedora-docs-old/proxy/files/cron-docs-old-rsync1
-rwxr-xr-xroles/fedora-docs-old/proxy/files/docs-old-rsync3
-rw-r--r--roles/fedora-docs-old/proxy/files/fedora-docs-old.conf19
-rw-r--r--roles/fedora-docs-old/proxy/tasks/main.yml25
-rw-r--r--roles/rsyncd/files/rsyncd.conf.sundries8
-rw-r--r--roles/rsyncd/files/rsyncd.conf.sundries-stg8
8 files changed, 74 insertions, 0 deletions
diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml
index 3b404ad5e..f741362f9 100644
--- a/playbooks/include/proxies-fedora-web.yml
+++ b/playbooks/include/proxies-fedora-web.yml
@@ -56,5 +56,8 @@
- 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 ddaa4a043..9735c8902 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -244,6 +244,13 @@
cert_name: "{{wildcard_cert_name}}"
- role: httpd/website
+ name: docs-old.fedoraproject.org
+ server_aliases:
+ - docs-old.stg.fedoraproject.org
+ sslonly: true
+ cert_name: "{{wildcard_cert_name}}"
+
+ - role: httpd/website
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
new file mode 100644
index 000000000..a7a55fd01
--- /dev/null
+++ b/roles/fedora-docs-old/proxy/files/cron-docs-old-rsync
@@ -0,0 +1 @@
+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
new file mode 100755
index 000000000..ff64cd6f2
--- /dev/null
+++ b/roles/fedora-docs-old/proxy/files/docs-old-rsync
@@ -0,0 +1,3 @@
+#!/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
new file mode 100644
index 000000000..52847d079
--- /dev/null
+++ b/roles/fedora-docs-old/proxy/files/fedora-docs-old.conf
@@ -0,0 +1,19 @@
+DocumentRoot /srv/web/docs-old.fedoraproject.org/
+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"
diff --git a/roles/fedora-docs-old/proxy/tasks/main.yml b/roles/fedora-docs-old/proxy/tasks/main.yml
new file mode 100644
index 000000000..f29033d7c
--- /dev/null
+++ b/roles/fedora-docs-old/proxy/tasks/main.yml
@@ -0,0 +1,25 @@
+- copy: >
+ src=docs-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
+ - redirects-old.conf
+ notify:
+ - reload proxyhttpd
+ tags:
+ - fedora-docs-old
+ - fedora-docs-old/proxy
diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries
index 032ef2db3..5cb888d3b 100644
--- a/roles/rsyncd/files/rsyncd.conf.sundries
+++ b/roles/rsyncd/files/rsyncd.conf.sundries
@@ -14,6 +14,14 @@ gid = root
read only = yes
hosts allow = 10.5.126.13 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.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0
+
[docs]
comment = Docs Site
path = /srv/web/docs
diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg
index 7bce112f0..ac2ac0362 100644
--- a/roles/rsyncd/files/rsyncd.conf.sundries-stg
+++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg
@@ -14,6 +14,14 @@ gid = root
read only = yes
hosts allow = 10.5.126.13 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.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0
+
[docs]
comment = Docs Site
path = /srv/web/docs