Merge pull request #14 from andersundsehr/bugfix/vhost-generation

Kanti · web-flow · commit 6257d843dc27 · 2024-02-09T15:48:19.000+01:00
diff --git a/server/generate-vhosts.php b/server/generate-vhosts.php
@@ -22,7 +22,9 @@ public function __construct()
 
             $vmNumber = $this->getVmNumber($domain);
 
-            $domainByVmNumber[$vmNumber][] = $domain;
+            if($vmNumber) {
+                $domainByVmNumber[$vmNumber][] = $domain;
+            }
         }
 
         $result = file_get_contents(self::INITAL_NGINX_CONF);
@@ -70,7 +72,7 @@ public function __construct()
     private function getVmNumber(string $domain): int
     {
         preg_match($this->getEnv('VM_NUMBER_REGEX', '/(^|\.)vm(?<vmNumber>[0-9]{2})\./'), $domain, $matches);
-        return (int)($matches['vmNumber'] ?? throw new \Exception(''));
+        return (int)($matches['vmNumber'] ?? 0);
     }
 
     private function removeOldCert(SplFileInfo $file): bool

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ public function __construct()`
`22`	`22`
`23`	`23`	`$vmNumber = $this->getVmNumber($domain);`
`24`	`24`
`25`		`- $domainByVmNumber[$vmNumber][] = $domain;`
	`25`	`+ if($vmNumber) {`
	`26`	`+ $domainByVmNumber[$vmNumber][] = $domain;`
	`27`	`+ }`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`$result = file_get_contents(self::INITAL_NGINX_CONF);`
`@@ -70,7 +72,7 @@ public function __construct()`
`70`	`72`	`private function getVmNumber(string $domain): int`
`71`	`73`	`{`
`72`	`74`	`preg_match($this->getEnv('VM_NUMBER_REGEX', '/(^\|\.)vm(?<vmNumber>[0-9]{2})\./'), $domain, $matches);`
`73`		`- return (int)($matches['vmNumber'] ?? throw new \Exception(''));`
	`75`	`+ return (int)($matches['vmNumber'] ?? 0);`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`private function removeOldCert(SplFileInfo $file): bool`