Просмотр исходного кода

fix error in default vhost configuration

master
Markus Katharina Brechtel 5 лет назад
Родитель
Сommit
e5e83b70b6
1 измененных файлов: 24 добавлений и 19 удалений
  1. +24
    -19
      templates/default-vhost.j2

+ 24
- 19
templates/default-vhost.j2 Просмотреть файл

@@ -1,33 +1,38 @@
{{ ansible_managed | comment }}


<VirtualHost _default_:443>

ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
ServerName localhost

ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined

DocumentRoot /var/www/default/
<Directory "/var/www/default/">
Options -Indexes
</Directory>
DocumentRoot /var/www/default/
<Directory "/var/www/default/">
Options -Indexes
</Directory>

SSLEngine on
SSLCertificateFile "/etc/ssl/certs/ssl-cert-snakeoil.pem"
SSLCertificateKeyFile "/etc/ssl/private/ssl-cert-snakeoil.key"
SSLEngine on
SSLCertificateFile "/etc/ssl/certs/ssl-cert-snakeoil.pem"
SSLCertificateKeyFile "/etc/ssl/private/ssl-cert-snakeoil.key"

</VirtualHost>

<VirtualHost _default_:80>

ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined

DocumentRoot /var/www/default/
<Directory "/var/www/default/">
Options -Indexes
</Directory>
DocumentRoot /var/www/default/
<Directory "/var/www/default/">
Options -Indexes
</Directory>

# redirect to https if file could not be found in /var/www/default/
RewriteEngine On
RewriteRule ^\/\.well-known\/acme-challenge\/ - [L]
RewriteRule (.*) https://%{SERVER_NAME}$1 [R,L]
# redirect to https if file could not be found in /var/www/default/
RewriteEngine On
RewriteRule ^\/\.well-known\/acme-challenge\/ - [L]
RewriteRule (.*) https://%{SERVER_NAME}$1 [R,L]

</VirtualHost>



Загрузка…
Отмена
Сохранить