Thunix/ansible
1
0
Fork 0
mirror of https://github.com/ThunixdotNet/ansible.git synced 2026-01-25 05:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Apache config for default server

Browse Source
This commit is contained in:
Naglfar
2021-12-26 12:13:00 +01:00
parent 8c2715fabb
commit 95c9b75f08
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/webserver/files/etc/apache2/sites-available/default-ssl.conf → roles/webserver/files/etc/apache2/sites-available/000-default-ssl.conf
View File

@@ -1,8 +1,8 @@
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<VirtualHost _default_:443> <VirtualHost _default_:443>
ServerName localhost
ServerAdmin webmaster@thunix.net ServerAdmin webmaster@thunix.net
DocumentRoot /var/www/000-default
DocumentRoot /var/www/thunix.cf
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg. # error, crit, alert, emerg.
@@ -10,8 +10,8 @@
# modules, e.g. # modules, e.g.
#LogLevel info ssl:warn #LogLevel info ssl:warn
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error-000-default.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access-000-default.log combined
# For most configuration files from conf-available/, which are # For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to # enabled or disabled at a global level, it is possible to

8
roles/webserver/files/etc/apache2/sites-available/000-default.conf
View File

@@ -6,10 +6,10 @@
# match this virtual host. For the default virtual host (this file) this # match this virtual host. For the default virtual host (this file) this
# value is not decisive as it is used as a last resort host regardless. # value is not decisive as it is used as a last resort host regardless.
# However, you must set it for any further virtual host explicitly. # However, you must set it for any further virtual host explicitly.
#ServerName www.example.com ServerName localhost
ServerAdmin webmaster@thunix.net ServerAdmin webmaster@thunix.net
DocumentRoot /var/www/thunix.cf DocumentRoot /var/www/000-default
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg. # error, crit, alert, emerg.
@@ -17,8 +17,8 @@
# modules, e.g. # modules, e.g.
#LogLevel info ssl:warn #LogLevel info ssl:warn
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error-000-default.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access-000-default.log combined
# For most configuration files from conf-available/, which are # For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to # enabled or disabled at a global level, it is possible to

2
roles/webserver/tasks/apache.yml
View File

@@ -15,6 +15,7 @@
src: ../files/etc/apache2/sites-available/{{ item }}.conf src: ../files/etc/apache2/sites-available/{{ item }}.conf
dest: /etc/apache2/sites-available/{{ item }}.conf dest: /etc/apache2/sites-available/{{ item }}.conf
loop: loop:
- 000-default
- thunix.net - thunix.net
- www.thunix.net - www.thunix.net
- ftp.thunix.net - ftp.thunix.net
@@ -32,6 +33,7 @@
dest: /etc/apache2/sites-enabled/{{ item }}.conf dest: /etc/apache2/sites-enabled/{{ item }}.conf
state: link state: link
loop: loop:
- 000-default
- thunix.net - thunix.net
- www.thunix.net - www.thunix.net
- ftp.thunix.net - ftp.thunix.net