updated README with vhost details and updated version

This commit is contained in:
Arne Teuke
2017-07-09 16:15:32 +01:00
parent ce399480a4
commit ef4e41395b
3 changed files with 2 additions and 2 deletions

View File

@@ -1,22 +0,0 @@
<VirtualHost *:<%= @ae_vhost_port %> >
ServerAdmin <%= @ae_server_admin%>
ServerName www.<%= @ae_server_name %>
ServerAlias <%= @ae_server_name %>
DocumentRoot <%= @ae_doc_root %>
<% if @ae_use_https == true and @ae_http_https_fw == true -%>
Redirect permanent / https://<%= @ae_server_name %>/
<% else -%>
DirectoryIndex <%= @ae_dir_index %>
<Directory <%= @ae_doc_root -%>
AllowOverride none
Order Allow,Deny
Allow from <%= @ae_allow_from %>
</Directory>
<% end %>
ErrorLog /var/log/httpd/<%= @ae_server_name%>_error_log
<% if @ae_use_access_log == true %>
CustomLog /var/log/httpd/<%= @ae_server_name%>_access_log common
<% end %>
LogLevel <%= @ae_vhost_loglevel %>
</VirtualHost>

View File

@@ -1,49 +0,0 @@
<VirtualHost *:<%= @ae_ssl_vhost_port %> >
ServerAdmin <%= @ae_server_admin %>
DocumentRoot <%= @ae_doc_root %>
ServerName www.<%= @ae_server_name %>
ServerAlias <%= @ae_server_name %>
DirectoryIndex <%= @ae_dir_index %>
ErrorLog /var/log/httpd/<%= @ae_server_name %>_ssl_error_log
TransferLog /var/log/httpd/<%= @ae_server_name%>_ssl_transfer_log
<% if @ae_use_access_log == true -%>
CustomLog /var/log/httpd/<%= @ae_server_name%>_ssl_access_log common
<% end -%>
LogLevel <%= @ae_vhost_loglevel %>
SSLEngine on
SSLProtocol <%= @ae_ssl_protocols%>
SSLCipherSuite "<%= @ae_ssl_ciphersuite%>"
<% if @ae_use_certbot == true -%>
SSLCertificateFile /etc/letsencrypt/live/<%= @ae_server_name %>/cert.pem
SSLCertificateKeyFile /etc/letsencrypt/live/<%= @ae_server_name %>/privkey.pem
SSLCertificateChainFile /etc/letsencrypt/live/<%= @ae_server_name %>/fullchain.pem
<% else -%>
SSLCertificateFile <%= @ae_tls_cert_path %>/<%= @ae_ssl_vhost_cert %>
SSLCertificateKeyFile <%= @ae_tls_key_path %>/<%= @ae_ssl_vhost_key %>
SSLCertificateChainFile <%= @ae_tls_cert_path %>/<%= @ae_ssl_vhost_chain %>
<% end -%>
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
<Directory "/var/www/cgi-bin">
SSLOptions +StdEnvVars
</Directory>
<Directory <%= @ae_doc_root -%>
AllowOverride none
Order Allow,Deny
Allow from <%= @ae_allow_from %>
</Directory>
<% end %>
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
CustomLog logs/ssl_request_log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>