diff --git a/.devilbox/bin/apache-2.2/splitlogs.php b/.devilbox/bin/apache-2.2/splitlogs.php deleted file mode 100755 index 97533d31..00000000 --- a/.devilbox/bin/apache-2.2/splitlogs.php +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env php - $time) { - if ((time() - ($time + 30)) >= 0) { - fclose(${$vhost}); - unset(${$vhost}); - unset($lastwrite[$vhost]); - } - } -} diff --git a/.devilbox/bin/apache-2.4/splitlogs.php b/.devilbox/bin/apache-2.4/splitlogs.php deleted file mode 100755 index 084753ab..00000000 --- a/.devilbox/bin/apache-2.4/splitlogs.php +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env php - $time) { - if ((time() - ($time + 30)) >= 0) { - fclose(${$vhost}); - unset(${$vhost}); - unset($lastwrite[$vhost]); - } - } -} diff --git a/.devilbox/etc/apache-2.2/01-vhost-default.conf b/.devilbox/etc/apache-2.2/01-vhost-default.conf index 01548aa4..d0b297c4 100644 --- a/.devilbox/etc/apache-2.2/01-vhost-default.conf +++ b/.devilbox/etc/apache-2.2/01-vhost-default.conf @@ -5,6 +5,10 @@ NameVirtualHost *:80 ServerName localhost + ServerAlias 127.0.0.1 + ServerAlias 172.16.238.* + ServerAlias httpd + ServerAdmin root@localhost ErrorLog /var/log/apache-2.2/localhost-error.log @@ -26,6 +30,3 @@ NameVirtualHost *:80 Allow from all - - - diff --git a/.devilbox/etc/apache-2.2/02-vhost-mass.conf b/.devilbox/etc/apache-2.2/02-vhost-mass.conf index d8db6161..6e809cd2 100644 --- a/.devilbox/etc/apache-2.2/02-vhost-mass.conf +++ b/.devilbox/etc/apache-2.2/02-vhost-mass.conf @@ -8,15 +8,12 @@ UseCanonicalName Off ServerName localhost - ServerAlias *.loc + ServerAlias *.* ServerAdmin root@localhost - # splitlogs.php is a custom script, which will filter the domain - # and create separate logfiles per domain. LogFormat "%V;%h;%l;%u;%t;\"%r\";%>s;%b;\"%{Referer}i\";\"%{User-agent}i\"" vcommon - CustomLog "|/opt/bin/splitlogs.php" vcommon - - ErrorLog /var/log/apache-2.2/other-error.log + CustomLog "/var/log/apache-2.2/projects-access.log" vcommon + ErrorLog /var/log/apache-2.2/projects-error.log DirectoryIndex index.php index.html @@ -38,6 +35,3 @@ Allow from all - - - diff --git a/.devilbox/etc/apache-2.4/01-vhost-default.conf b/.devilbox/etc/apache-2.4/01-vhost-default.conf index 32a8b850..d607737f 100644 --- a/.devilbox/etc/apache-2.4/01-vhost-default.conf +++ b/.devilbox/etc/apache-2.4/01-vhost-default.conf @@ -5,6 +5,10 @@ ServerName localhost + ServerAlias 127.0.0.1 + ServerAlias 172.16.238.* + ServerAlias httpd + ServerAdmin root@localhost ErrorLog /var/log/apache-2.4/localhost-error.log @@ -27,6 +31,3 @@ Require all granted - - - diff --git a/.devilbox/etc/apache-2.4/02-vhost-mass.conf b/.devilbox/etc/apache-2.4/02-vhost-mass.conf index 3ede978d..a797d622 100644 --- a/.devilbox/etc/apache-2.4/02-vhost-mass.conf +++ b/.devilbox/etc/apache-2.4/02-vhost-mass.conf @@ -8,15 +8,12 @@ UseCanonicalName Off ServerName localhost - ServerAlias *.loc + ServerAlias *.* ServerAdmin root@localhost - # splitlogs.php is a custom script, which will filter the domain - # and create separate logfiles per domain. LogFormat "%V;%h;%l;%u;%t;\"%r\";%>s;%b;\"%{Referer}i\";\"%{User-agent}i\"" vcommon - CustomLog "|/opt/bin/splitlogs.php" vcommon - - ErrorLog /var/log/apache-2.4/other-error.log + CustomLog "/var/log/apache-2.4/projects-access.log" vcommon + ErrorLog /var/log/apache-2.4/projects-error.log DirectoryIndex index.php index.html @@ -39,6 +36,3 @@ Require all granted - - - diff --git a/.devilbox/etc/nginx-mainline/01-vhost-default.conf b/.devilbox/etc/nginx-mainline/01-vhost-default.conf index 0d035abc..2dc74075 100644 --- a/.devilbox/etc/nginx-mainline/01-vhost-default.conf +++ b/.devilbox/etc/nginx-mainline/01-vhost-default.conf @@ -5,6 +5,11 @@ server { listen 80 default_server; server_name _; + server_name localhost; + server_name 127\.0\.0\.1; + server_name httpd; + server_name 172\.16\.238\..*; + # Root directive root /var/www/default/htdocs; diff --git a/.devilbox/etc/nginx-mainline/02-vhost-mass.conf b/.devilbox/etc/nginx-mainline/02-vhost-mass.conf index 85cd1123..e9ae4629 100644 --- a/.devilbox/etc/nginx-mainline/02-vhost-mass.conf +++ b/.devilbox/etc/nginx-mainline/02-vhost-mass.conf @@ -4,14 +4,14 @@ server { listen 80; - server_name ~^(?.+)\.loc$; + server_name ~^(?.+)\.[a-zA-Z]+$; # Root directive root /shared/httpd/$domain/htdocs/; index index.php; - access_log /var/log/nginx-mainline/$domain-access.log main; - error_log /var/log/nginx-mainline/other-error.log warn; + access_log /var/log/nginx-mainline/projects-access.log main; + error_log /var/log/nginx-mainline/projects-error.log warn; # Front-controller pattern as recommended by the nginx docs diff --git a/.devilbox/etc/nginx-stable/01-vhost-default.conf b/.devilbox/etc/nginx-stable/01-vhost-default.conf index fe4970de..ad9f45a9 100644 --- a/.devilbox/etc/nginx-stable/01-vhost-default.conf +++ b/.devilbox/etc/nginx-stable/01-vhost-default.conf @@ -5,6 +5,10 @@ server { listen 80 default_server; server_name _; + server_name localhost; + server_name 127\.0\.0\.1; + server_name httpd; + server_name 172\.16\.238\..*; # Root directive root /var/www/default/htdocs; diff --git a/.devilbox/etc/nginx-stable/02-vhost-mass.conf b/.devilbox/etc/nginx-stable/02-vhost-mass.conf index 661b1747..a237a137 100644 --- a/.devilbox/etc/nginx-stable/02-vhost-mass.conf +++ b/.devilbox/etc/nginx-stable/02-vhost-mass.conf @@ -4,14 +4,14 @@ server { listen 80; - server_name ~^(?.+)\.loc$; + server_name ~^(?.+)\.[a-zA-Z]+$; # Root directive root /shared/httpd/$domain/htdocs/; index index.php; - access_log /var/log/nginx-stable/$domain-access.log main; - error_log /var/log/nginx-stable/other-error.log warn; + access_log /var/log/nginx-stable/projects-access.log main; + error_log /var/log/nginx-stable/projects-error.log warn; # Front-controller pattern as recommended by the nginx docs