[TASK] Change naming of VirtualHost files

mocdk · Aug 8, 2016 · 43db082 · 43db082
1 parent eee8d60
commit 43db082
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Classes/Service/InstallCmsService.php b/Classes/Service/InstallCmsService.php
@@ -165,7 +165,7 @@ private function task_createVhost() {
 			'sudo mv %s %s',
 			array(
 				$file,
-				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'],
+				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'] . '.conf',
 			)
 		);
 

diff --git a/Classes/Service/InstallEmptyService.php b/Classes/Service/InstallEmptyService.php
@@ -32,7 +32,7 @@ private function task_createVhost() {
 			'sudo mv %s %s',
 			array(
 				$file,
-				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'],
+				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'] . '.conf',
 			)
 		);
 

diff --git a/Classes/Service/InstallFlowService.php b/Classes/Service/InstallFlowService.php
@@ -100,7 +100,7 @@ private function task_createVhost() {
 			'sudo mv %s %s',
 			array(
 				$file,
-				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'],
+				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'] . '.conf',
 			)
 		);
 

diff --git a/Resources/VirtualHostCms.template b/Resources/VirtualHostCms.template
@@ -14,8 +14,9 @@
 		Require all granted
 	</Directory>
 
-	ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-vagrant.sock|fcgi://127.0.0.1:9000{documentRoot}/{installationName}/docs
-
+	ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php/php5-fpm-vagrant.sock|fcgi://127.0.0.1:9000{documentRoot}/{installationName}/docs
+	# ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php/php70-fpm-vagrant.sock|fcgi://127.0.0.1:9000{documentRoot}/{installationName}/docs
+
 	## Logging
 	ErrorLog "{documentRoot}/{installationName}/logs/error.log"
 	ServerSignature Off
-Original file line number
+Diff line change
@@ Expand Up / @@ -165,7 +165,7 @@ private function task_createVhost() { @@
     			'sudo mv %s %s',
     			array(
     				$file,
-    				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'],
+    				$this->configuration['locations']['apache_sites'] . '/' . $this->installationConfiguration['name'] . '.conf',
     			)
     		);
@@ Expand Down @@