Update build.php

Author: lcherone

src/tasks/build.php

@@ -21,9 +21,8 @@
  */
 
 if (!defined('DEBUG')) {
-    //define('DEBUG', !empty($this->task->config['debug']));
-
-    define('DEBUG', true);
+    // define('DEBUG', !empty($this->task->config['debug']));
+	define('DEBUG', true);
 }
 
 if (!defined('TMP_DIR')) {
@@ -87,12 +86,16 @@ public function build($routes)
                 $restart_nginx = true;
 
                 $this->path = "/etc/nginx/proxied/servers/".basename($row['name']);
+				
+				echo DEBUG ? $this->log('NGINX path: '.$this->path) : null;
 
                 // check for config folder
                 if (!file_exists($this->path)) {
-                    echo DEBUG ? $this->log('Create config directory: '.$this->path) : null;
+                    echo DEBUG ? $this->log('Create config directory (CREATE): '.$this->path) : null;
                     mkdir($this->path, 0755, true);
-                }
+                } else {
+					echo DEBUG ? $this->log('Create config directory (EXISTS): '.$this->path) : null;
+				}
 
                 // build nginx configs
                 if (!$this->config_upstream($row)) {
@@ -123,18 +126,7 @@ public function build($routes)
             // reload nginx if config test passed
             if ($restart_nginx === true) {
                 if ($this->config_test_nginx()) {
-                    exec('/usr/sbin/nginx -s reload 2>&1', $out, $exit_code);
-                    
-                    echo DEBUG ? $this->log('Reloading NGINX: [exit code: '.$exit_code.']: '.print_r($out, true)) : null;
-
-                    // out is not empty
-                    if (!empty($out)) {
-                        echo DEBUG ? $this->log('NGINX was reloaded with warnings! Some routes may be effected.') : null;
-                    }
-                    // all is good
-                    else {
-                        echo DEBUG ? $this->log('NGINX was reloaded.') : null;
-                    }
+                    $this->reload_nginx();
                 } else {
                     echo DEBUG ? $this->log('NGINX was not reloaded.') : null;
                 }
@@ -154,6 +146,25 @@ public function config_test_nginx()
             echo DEBUG ? $this->log('Testing NGINX config: [exit code: '.$exit_code.']: '.print_r($out, true)) : null;
             return ($exit_code == 0);
         }
+		
+		/**
+		*
+		*/
+		public function reload_nginx()
+		{
+			exec('/usr/sbin/nginx -s reload 2>&1', $out, $exit_code);
+                    
+            echo DEBUG ? $this->log('Reloading NGINX: [exit code: '.$exit_code.']: '.print_r($out, true)) : null;
+
+            // out is not empty
+            if (!empty($out)) {
+                echo DEBUG ? $this->log('NGINX was reloaded with warnings! Some routes may be effected.') : null;
+            }
+            // all is good
+            else {
+                echo DEBUG ? $this->log('NGINX was reloaded.') : null;
+            }
+		}
 
         /**
          *
@@ -163,11 +174,13 @@ public function config_http($row)
             echo DEBUG ? $this->log('Building NGINX HTTP server config.') : null;
 
             $domains = [];
-            foreach ($row->ownDomain as $domain) {
+            foreach ($row->with("ORDER BY LENGTH(name) ASC")->ownDomain as $domain) {
                 $domains[] = $domain->name;
             }
+			
+			echo DEBUG ? $this->log('Domains: '.print_r($domains, true)) : null;
 
-            return file_put_contents(
+            $bytes_written = file_put_contents(
                 $this->path.'/http.conf',
                 '# Auto generated on '.date_create()->format('Y-m-d H:i:s').'
 # Do not edit this file as any changes will be overwritten!
@@ -214,6 +227,13 @@ public function config_http($row)
 }
 '
             );
+			
+			if ($bytes_written && $this->config_test_nginx()) {
+                $this->reload_nginx();
+				sleep(1);
+            }
+				
+			return $bytes_written;
         }
 
         /**
@@ -234,9 +254,11 @@ public function config_https($row)
             echo DEBUG ? $this->log('Building NGINX HTTPS server config.') : null;
 
             $domains = [];
-            foreach ($row->ownDomain as $domain) {
+            foreach ($row->with("ORDER BY LENGTH(name) ASC")->ownDomain as $domain) {
                 $domains[] = $domain->name;
             }
+			
+			echo DEBUG ? $this->log('Domains: '.print_r($domains, true)) : null;
 
             // check certs for letsencrypt
             if (isset($row['ssl_type']) && $row['ssl_type'] == 'letsencrypt') {
@@ -331,9 +353,7 @@ public function config_https($row)
 
                     try {
                         //
-                        $ac = new ACMECert(false);
-
-                        // crurrentcersts are not v2 but are acme-01, so need to delete
+                        $ac = new ACMECert();
 
                         if (!is_file(LETS_ENCRYPT_CERTS_PATH.'/_account/private.pem')) {
                             echo DEBUG ? $this->log('Starting new account registration.') : null;
@@ -357,7 +377,7 @@ public function config_https($row)
                         $domain_config = [];
                         foreach ($domains as $key => $value) {
                             $domain_config[$value] = [
-                                'challenge' => 'http-01', 'docroot' => '/usr/share/nginx/html/letsencrypt/'.$value
+                                'challenge' => 'http-01', 'docroot' => '/usr/share/nginx/html/letsencrypt/'.$domains[0]
                             ];
                         }
 
@@ -621,8 +641,17 @@ public function getAccountID(){
             return $this->kid_header['kid'];
         }
 
-        public function log($txt){
-            error_log($txt);
+        public function log($message){
+            echo DEBUG ? " - ".$message."\n" : null;
+            if (LOG) {
+                if (!file_exists(TMP_DIR.'/logs')) {
+                    mkdir(TMP_DIR.'/logs', 0755, true);
+                }
+                $log  = '['.date("c").'] '.$message.PHP_EOL;
+                file_put_contents(TMP_DIR.'/logs/nginx.'.date("d-m-Y").'.txt', $log, FILE_APPEND);
+                
+                shell_exec('chown www-data:www-data '.TMP_DIR.'/logs -R');
+            }
         }
 
         protected function get_openssl_error(){