diff options
Diffstat (limited to 'deployment/websites')
| -rw-r--r-- | deployment/websites/templates/vhost_meetbot.conf | 4 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_static.conf | 4 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_www.conf | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/deployment/websites/templates/vhost_meetbot.conf b/deployment/websites/templates/vhost_meetbot.conf index a6f812c5..40a0f92a 100644 --- a/deployment/websites/templates/vhost_meetbot.conf +++ b/deployment/websites/templates/vhost_meetbot.conf @@ -1,6 +1,6 @@ <VirtualHost *:80> ServerAdmin sysadm@mageia.org - ServerName meetbot.<%= domain %> + ServerName meetbot.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::meetbot::vhostdir") %> CustomLog /var/log/httpd/access_meetbot_log combined @@ -17,7 +17,7 @@ <VirtualHost *:443> ServerAdmin sysadm@mageia.org - ServerName meetbot.<%= domain %> + ServerName meetbot.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::meetbot::vhostdir") %> CustomLog /var/log/httpd/access_meetbot_log combined diff --git a/deployment/websites/templates/vhost_static.conf b/deployment/websites/templates/vhost_static.conf index d250a712..fcadc425 100644 --- a/deployment/websites/templates/vhost_static.conf +++ b/deployment/websites/templates/vhost_static.conf @@ -1,5 +1,5 @@ <VirtualHost *:80> - ServerName static.<%= domain %> + ServerName static.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %> CustomLog /var/log/httpd/static_log combined @@ -40,7 +40,7 @@ </VirtualHost> <VirtualHost *:443> - ServerName static.<%= domain %> + ServerName static.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %> CustomLog /var/log/httpd/static_log combined diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf index 79ac0ee1..399681be 100644 --- a/deployment/websites/templates/vhost_www.conf +++ b/deployment/websites/templates/vhost_www.conf @@ -1,6 +1,6 @@ Redirect /wiki https://wiki.mageia.org/# -# Everything under /g/ is static content to be served by a seconday host +# Everything under /g/ is static content to be served by a secondary host RewriteEngine On RewriteRule ^g/(.+)$ https://static.mageia.org/g/$1 [R,L,QSA] |