diff options
author | Dan Fandrich <danf@mageia.org> | 2024-10-04 19:28:06 -0700 |
---|---|---|
committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 19:28:06 -0700 |
commit | 2c7da66570999dcd21f11f976dc6ec27d820f45c (patch) | |
tree | b97dd9f25df691c66b2be31b658cc6fec638d47e /modules/apache/templates/01_default_ssl_vhost.conf | |
parent | a69863ece1973cf3eae488f30c657b57dfb89779 (diff) | |
download | puppet-2c7da665.tar puppet-2c7da665.tar.gz puppet-2c7da665.tar.bz2 puppet-2c7da665.tar.xz puppet-2c7da665.zip |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
Diffstat (limited to 'modules/apache/templates/01_default_ssl_vhost.conf')
-rw-r--r-- | modules/apache/templates/01_default_ssl_vhost.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/apache/templates/01_default_ssl_vhost.conf b/modules/apache/templates/01_default_ssl_vhost.conf index c9cdcfcd..16c048a6 100644 --- a/modules/apache/templates/01_default_ssl_vhost.conf +++ b/modules/apache/templates/01_default_ssl_vhost.conf @@ -15,7 +15,7 @@ # General setup for the virtual host DocumentRoot "/var/www/html" #ServerName localhost:443 -ServerAdmin root@<%= domain %> +ServerAdmin root@<%= @domain %> ErrorLog logs/ssl_error_log <IfModule mod_log_config.c> @@ -39,9 +39,9 @@ SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:EC SSLProtocol ALL -SSLv2 -SSLv3 <%- if wildcard_sslcert == 'true' then -%> -SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt -SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key -SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem +SSLCertificateFile /etc/ssl/wildcard.<%= @domain %>.crt +SSLCertificateKeyFile /etc/ssl/wildcard.<%= @domain %>.key +SSLCACertificateFile /etc/ssl/wildcard.<%= @domain %>.pem SSLVerifyClient None <%- else -%> SSLCertificateFile /etc/ssl/apache/localhost.pem |