diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-05 16:09:13 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-05 16:39:54 -0700 |
| commit | a7797c331e1fa86bdef5c49d6870d822dc591217 (patch) | |
| tree | ab13b66e6f59511f98c5973ecbff36af876b57cc /modules/apache/templates/vhost_ssl.conf | |
| parent | 9d1a749d073a5997cd435ac51c5c65eb050b2af5 (diff) | |
| download | puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar.gz puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar.bz2 puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar.xz puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.zip | |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
This take leaves alone accesses of variables that are defined within the
template, which don't seem to allow an @.
This batch of changes is for templates related to web sites.
Diffstat (limited to 'modules/apache/templates/vhost_ssl.conf')
| -rw-r--r-- | modules/apache/templates/vhost_ssl.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/apache/templates/vhost_ssl.conf b/modules/apache/templates/vhost_ssl.conf index e39e6820..0cb52eca 100644 --- a/modules/apache/templates/vhost_ssl.conf +++ b/modules/apache/templates/vhost_ssl.conf @@ -2,12 +2,12 @@ SSLProtocol ALL -SSLv2 -SSLv3 SSLHonorCipherOrder On SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS - <%- if wildcard_sslcert == 'true' then -%> - SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt - SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key - SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem + <%- if @wildcard_sslcert == 'true' then -%> + 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/<%= real_vhost %>.pem - SSLCertificateKeyFile /etc/ssl/apache/<%= real_vhost %>.pem + SSLCertificateFile /etc/ssl/apache/<%= @real_vhost %>.pem + SSLCertificateKeyFile /etc/ssl/apache/<%= @real_vhost %>.pem <%- end -%> |