From 43db0827f604f937928b2dbf1ac71a252ccb3f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Klixbu=CC=88ll=20Langeland?= Date: Mon, 8 Aug 2016 15:16:11 +0200 Subject: [PATCH] [TASK] Change naming of VirtualHost files --- Classes/Service/InstallCmsService.php | 2 +- Classes/Service/InstallEmptyService.php | 2 +- Classes/Service/InstallFlowService.php | 2 +- Resources/VirtualHostCms.template | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Classes/Service/InstallCmsService.php b/Classes/Service/InstallCmsService.php index 85e87db..9ca4a0d 100644 --- 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 index ab0226e..4ba6cdf 100644 --- 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 index f9184ef..0988536 100644 --- 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 index 30223a2..23dd23b 100644 --- a/Resources/VirtualHostCms.template +++ b/Resources/VirtualHostCms.template @@ -14,8 +14,9 @@ Require all granted - 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