diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /deployment/websites | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
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 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deployment/websites/templates/vhost_meetbot.conf b/deployment/websites/templates/vhost_meetbot.conf index 40a0f92a..a6f812c5 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 fcadc425..d250a712 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 |