aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/websites
diff options
context:
space:
mode:
authorDan Fandrich <danf@mageia.org>2024-10-04 19:28:06 -0700
committerDan Fandrich <danf@mageia.org>2024-10-04 19:28:06 -0700
commit2c7da66570999dcd21f11f976dc6ec27d820f45c (patch)
treeb97dd9f25df691c66b2be31b658cc6fec638d47e /deployment/websites
parenta69863ece1973cf3eae488f30c657b57dfb89779 (diff)
downloadpuppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar
puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.gz
puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.bz2
puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.xz
puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.zip
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
Diffstat (limited to 'deployment/websites')
-rw-r--r--deployment/websites/templates/vhost_meetbot.conf4
-rw-r--r--deployment/websites/templates/vhost_static.conf4
2 files changed, 4 insertions, 4 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