commit f42af42d2a07e1f49b550e64405db98d1f0e41ae
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 22 14:46:43 2016 +0200
Others fixup
playbooks/include/proxies-rewrites.yml | 39 ++-----------------------------
playbooks/include/proxies-websites.yml | 1 +
2 files changed, 4 insertions(+), 36 deletions(-)
---
diff --git a/playbooks/include/proxies-rewrites.yml
b/playbooks/include/proxies-rewrites.yml
index c72f73b..67be69c 100644
--- a/playbooks/include/proxies-rewrites.yml
+++ b/playbooks/include/proxies-rewrites.yml
@@ -15,44 +15,11 @@
- role: httpd/domainrewrite
destname: admin
- website:
admin.fedoraproject.org
- target:
https://apps.fedoraproject.org/
+ website:
admin.rpmfusion.org
+ target:
https://admin.rpmfusion.org/account
- role: httpd/domainrewrite
destname: apache-status
- website:
admin.fedoraproject.org
+ website:
admin.rpmfusion.org
path: /status
- - role: httpd/domainrewrite
- destname: 00-admin
- website:
admin.fedoraproject.org
- path: ^/favicon.ico$
- status: 301
- target:
https://fedoraproject.org/static/images/favicon.ico
-
- - role: httpd/domainrewrite
- destname: 00-docs
- website:
docs.fedoraproject.org
- path: ^/favicon.ico$
- status: 301
- target:
https://fedoraproject.org/static/images/favicon.ico
-
- - role: httpd/domainrewrite
- destname: 00-start
- website:
start.fedoraproject.org
- path: ^/favicon.ico$
- status: 301
- target:
https://fedoraproject.org/static/images/favicon.ico
-
- - role: httpd/domainrewrite
- destname: translate
- website:
translate.fedoraproject.org
- # TODO - At some point, this will switch to
fedora.zanata.org
- target:
https://fedora.transifex.net/
-
- - role: httpd/domainrewrite
- destname: 00-translate-icon
- website:
translate.fedoraproject.org
- path: ^/favicon.ico$
- status: 301
- target:
https://fedoraproject.org/static/images/favicon.ico
diff --git a/playbooks/include/proxies-websites.yml
b/playbooks/include/proxies-websites.yml
index 4d87109..33de02e 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -50,6 +50,7 @@
name:
rpmfusion.org
server_aliases:
- localhost
+ cert_name: "{{wildcard_cert_name}}"
- role: httpd/website
name:
admin.rpmfusion.org