[ansible] Override pkgs.rpmfusion.org in distdit

commit d47ecd9692213500f29ffebbeca9c423bb0e5c42 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Fri Jul 22 16:42:59 2016 +0200 Override pkgs.rpmfusion.org in distdit playbooks/include/proxies-websites.yml | 11 ++++++----- roles/distgit/files/pkgs.rpmfusion.org.conf | 12 +++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) --- diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index fc362c9..a39b3bd 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -90,10 +90,11 @@ cert_name: "{{wildcard_cert_name}}" - - role: httpd/website - name: pkgs.rpmfusion.org - sslonly: false - cert_name: pkgs.rpmfusion.org - SSLCertificateChainFile : pkgs.rpmfusion.org-intermediate.cert +# Overrided in distgit role +# - role: httpd/website +# name: pkgs.rpmfusion.org +# sslonly: false +# cert_name: pkgs.rpmfusion.org +# SSLCertificateChainFile : pkgs.rpmfusion.org-intermediate.cert diff --git a/roles/distgit/files/pkgs.rpmfusion.org.conf b/roles/distgit/files/pkgs.rpmfusion.org.conf index 2e8840e..a1271c8 100644 --- a/roles/distgit/files/pkgs.rpmfusion.org.conf +++ b/roles/distgit/files/pkgs.rpmfusion.org.conf @@ -1,11 +1,11 @@ # SSL host -<VirtualHost pkgs.rpmfusion.org:443> +<VirtualHost *:443> # This alias must come before the /repo/ one to avoid being overridden. ScriptAlias /repo/pkgs/upload.cgi /srv/web/upload.cgi Alias /repo/ /srv/cache/lookaside/ ServerName pkgs.rpmfusion.org - ServerAdmin sysadmin(a)lists.rpmfusion.org + ServerAdmin root(a)rpmfusion.org SSLEngine on @@ -33,11 +33,13 @@ </VirtualHost> -<VirtualHost pkgs.rpmfusion.org:80> +<VirtualHost *:80> ServerName pkgs.rpmfusion.org - ServerAdmin sysadmin(a)lists.rpmfusion.org + ServerAdmin root(a)rpmfusion.org + + + include "conf.d/pkgs.rpmfusion.org/*.conf" -Redirect / https://pkgs.rpmfusion.org/ </VirtualHost>