Bozhidar Slaveykov 1 年間 前
コミット
166582490f

+ 4 - 3
web/app/Actions/ApacheWebsiteApplySSLVirtualHost.php

@@ -60,12 +60,13 @@ class ApacheWebsiteApplySSLVirtualHost
         ];
         ];
         $apache2SSLSample = view('actions.samples.ubuntu.apache2-ssl-conf',$settings)->render();
         $apache2SSLSample = view('actions.samples.ubuntu.apache2-ssl-conf',$settings)->render();
 
 
-        $apache2SSLOptionsSample = view('actions.samples.ubuntu.apache2-ssl-options-conf')->render();
-
-
         $fileManagerApi = new FileManagerApi();
         $fileManagerApi = new FileManagerApi();
 
 
+        $apache2SSLOptionsSample = view('actions.samples.ubuntu.apache2-ssl-options-conf')->render();
         $apache2SSLOptionsFilePath = '/etc/apache2/phyre/options-ssl-apache.conf';
         $apache2SSLOptionsFilePath = '/etc/apache2/phyre/options-ssl-apache.conf';
+        if (!$fileManagerApi->isDir('/etc/apache2/phyre')) {
+            $fileManagerApi->mkdir('/etc/apache2/phyre');
+        }
         if (!$fileManagerApi->fileExists($apache2SSLOptionsFilePath)) {
         if (!$fileManagerApi->fileExists($apache2SSLOptionsFilePath)) {
             $fileManagerApi->filePutContents($apache2SSLOptionsFilePath, $apache2SSLOptionsSample);
             $fileManagerApi->filePutContents($apache2SSLOptionsFilePath, $apache2SSLOptionsSample);
         }
         }

+ 5 - 0
web/app/FileManagerApi.php

@@ -4,6 +4,11 @@ namespace App;
 
 
 class FileManagerApi
 class FileManagerApi
 {
 {
+    public function isDir($path)
+    {
+        return is_dir($path);
+    }
+
     public function mkdir($path)
     public function mkdir($path)
     {
     {
         ShellApi::exec('mkdir -p '.$path);
         ShellApi::exec('mkdir -p '.$path);

+ 1 - 1
web/resources/views/actions/samples/ubuntu/apache2-ssl-conf.blade.php

@@ -16,6 +16,6 @@
         SSLCertificateKeyFile {{$sslCertificateKeyFilePath}}
         SSLCertificateKeyFile {{$sslCertificateKeyFilePath}}
         SSLCertificateChainFile {{$sslCertificateChainFilePath}}
         SSLCertificateChainFile {{$sslCertificateChainFilePath}}
 
 
-        Include /etc/letsencrypt/options-ssl-apache.conf
+        Include /etc/apache2/phyre/options-ssl-apache.conf
     </VirtualHost>
     </VirtualHost>
 </IfModule>
 </IfModule>