Add apache configuration customization layer (closes #3)

tollwerk · Dec 11, 2017 · 864ba2b · 864ba2b
1 parent e79cc59
commit 864ba2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/Admin/Infrastructure/Persistence/Apache.php b/src/Admin/Infrastructure/Persistence/Apache.php
@@ -123,8 +123,9 @@ public function __invoke(VhostInterface $vhost)
         }
 
         // Add the virtual host include
-        $this->addEntry($files, 'apache_vhost.include',
-            TemplateService::render('apache_vhost.include', $variables));
+        $this->addEntry($files, 'apache_vhost.include', TemplateService::render('apache_vhost.include', $variables));
+        $this->addEntry($files, 'apache_vhost_custom_directory.include?', TemplateService::render('apache_vhost_custom_directory.include', $variables));
+        $this->addEntry($files, 'apache_vhost_custom_all.include?', '');
 
         // If the HTTPS protocol is supported
         $httpsPorts = $vhost->getPorts(Vhost::PROTOCOL_HTTPS);
@@ -177,6 +178,7 @@ public function __invoke(VhostInterface $vhost)
             $variables['ssl'] = false;
             $this->addEntry($files, 'apache_vhost.conf',
                 TemplateService::render('apache_vhost.conf', $variables));
+            $this->addEntry($files, 'apache_vhost_custom_'.$httpPort.'.include?', '');
         }
 
         $absoluteFiles = [];

diff --git a/src/Admin/Infrastructure/Templates/apache_vhost.conf b/src/Admin/Infrastructure/Templates/apache_vhost.conf
@@ -2,4 +2,6 @@
     Protocols h2 http/1.1{{#ssl}}
     Include {{configroot}}/apache_ssl.include{{/ssl}}
     Include {{configroot}}/apache_vhost.include
+    Include {{configroot}}/apache_vhost_custom_all.include
+    Include {{configroot}}/apache_vhost_custom_{{port}}.include
 </VirtualHost>
diff --git a/src/Admin/Infrastructure/Templates/apache_vhost.include b/src/Admin/Infrastructure/Templates/apache_vhost.include
@@ -5,13 +5,7 @@ CustomLog {{logdir}}/access_{{primary_domain}}_log combined
 
 DocumentRoot "{{docroot}}"
 <Directory "{{docroot}}">
-	RewriteEngine on
-	RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-	RewriteRule .* - [F]
-
-	Options -Indexes +FollowSymLinks
-	AllowOverride All
-	Require all granted
+    Include {{configroot}}/apache_vhost_directory.include
 </Directory>{{#php_version}}
 
 Include {{configroot}}/apache_fmp.include{{/php_version}}
diff --git a/src/Admin/Infrastructure/Templates/apache_vhost_custom_directory.include b/src/Admin/Infrastructure/Templates/apache_vhost_custom_directory.include
@@ -0,0 +1,7 @@
+RewriteEngine on
+RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+RewriteRule .* - [F]
+
+Options -Indexes +FollowSymLinks
+AllowOverride All
+Require all granted