vhost

Signed-off-by: Nic Boet <nic@boet.cc>
nabbi · Jun 21, 2023 · ba36a00 · ba36a00
1 parent 9355377
commit ba36a00
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
@@ -7,8 +7,8 @@ AUX init.d-r1 708 BLAKE2B 5b132726dff32d0443d878739936d292a30362e942d3d332c145cc
 AUX zoneminder-1.34.17_dont_gz_man.patch 1587 BLAKE2B 29dd32c2673a58a6e9c5657a8394eb1a36cec5681b3f4c9ac05e9522785cb066cc5cfbd1f4e5e0c7a0acce0675b86f8c061c51cbd81b9582ed9b08de5616fb25 SHA512 805be8f6d81d3ad9a63330e27630ea9667590a0c0500fea830ebae07231e638db74bf371e4c73bf822cbc28bffe0c3dab1e39ac958747b2da3176575c4c3cdea
 AUX zoneminder-1.36.18-semaphore.patch 627 BLAKE2B a3b52482bca4e163554a5cdced7d8c688aa0342b2a0a3ca1f47d965e52fbcde6567a72d9cc3b5ac3d2460bd164c81b1e8be5e1df93565bf90e2c119ec624305d SHA512 150e5dc6e444c08fd3dd2680507130aa883c5fa13394f2f6e459e30d26c061f5e99379945dc2493bfa0bacea2640d1b0d30e1961926552d8c83456bea7646046
 AUX zoneminder.service 212 BLAKE2B 4a7497025b8d315c5a77a6e1f0d80000c3eb363ced1f2285c6b594b871283eba941e267a4590fba5ea89fb3e1529dcec93a63d67025b569ba0411f9e42103680 SHA512 3824076594e18ee89ca28e622f87bf9bd51156d0ef9d71fe8d20d69b682ecf8c96fb779cbaf33f1709aec0ec9fd1b5448b8524c781510718549282e68c095a90
-AUX zoneminder_vhost.conf 1205 BLAKE2B 6ef257365b3c4733888b79115a09caaef94fb3022fc5687d46052561c085b4dd1041c3f15430d04a1567421c27200ffb093c49e03e7197ee8ecacc83b9e06baa SHA512 48f0304719b64aa3a54ec184468cc9082195b76fd3be27d0a0863e5621daba7efe87705e86976a7fd4b497da398eb17342d8e9d0da1a2cc70fbd510cdf201307
-AUX zoneminder_vhost.include 1899 BLAKE2B 97aa6c772df4d282b6cb03ed8656b6e6458adc609479e7ac7936890d3647b76388b911072e6ecb222908ef7d004f6fa4b43cd098a6d82c55076fa61eb75732aa SHA512 26acb5705086167a50b4f7577f32b2bf04cd8deccf7b7a21ec003c8aa00b5293d623a48b2b76fe36aeec70247f09e220463dc91c22f879202cc50e3fec940dec
+AUX zoneminder_vhost.conf 1155 BLAKE2B 40fb3f5a8c427b004f8ed2582ed4488f974b81956880f2287118ff6a1196c35e1c5c684f4beb8be0dbba60ca0203df43e7cae48ed6677bc4e96fbba87a3e54e6 SHA512 a02ee173557b4fedb20a7594c1c7748bd4958d8dac4cad3a5c16f789ed1d82c1da4aa5473ad42a0b544643334b79e6ed54c3ac26446aa6079481888b3c694670
+AUX zoneminder_vhost.include 1781 BLAKE2B f75521d3c7d52e040963f3bfafa762c79938e5d01864f655d6f759cf22a8c1731086bde3fd202051ee4839cf171ae74c3c60f927b11a4a1b1e88bfa48161a844 SHA512 5611b104238ccd999c395ec8e75d4b4b433d2a4bce87a2de050d12767d8886536c1b2346e45c99c4d5088079277a3fd14b862aff56753018fe2a7f8fc7177908
 DIST CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz 3504 BLAKE2B e29562d12de5722b6f02078d09337a49a2d70f16cb7fa45f60d9b2350982a7376c11a592b529197e402b307596a20ee722db666877b00f0f0ef6622491ff7002 SHA512 75f2188e548b98191c8df82fb76e918f3bda9788f541449df8fa92449ad19aa0b9c13420dd91c760e08a4d31956ad51602242ab97e3bd4460f01e99f49992453
 DIST CakePHP-Enum-Behavior-master.tar.gz 3506 BLAKE2B 6abe49860f67cebff0f7d4ca72da3e7de57ec4cc7825a73bd5e5774b5619b5806239e61e9e1dd9f978f6b97ee1d9f304e8bc41b1b614b7dd44cafb5d773cb35a SHA512 fa51aa34749cf0e7c9c484c4d65718696230291780df1bac9a5ca8144a230d5cdfdf2ff2fae413248a09ddd14615dbe88b111713e11173aa9d9078c5b3c9064c
 DIST Crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz 73086 BLAKE2B 02a9448601f2a920dd94c2bee258c4a9e8e7161eea4dc427771734009ff304fc66fd537186f849be1f2c7b787cd5824f4b7990b7f19ef0c163d93fb53db378d7 SHA512 da58528686baf05385ad08079f965bce10eba6d599133ab773e9ab1f9e4b7d82cf5431b4b773317b90effb16e0b026a029bdfabe08a9ef1a5e9b94e7a1c2ea9e

diff --git a/www-misc/zoneminder/files/zoneminder_vhost.conf b/www-misc/zoneminder/files/zoneminder_vhost.conf
@@ -1,5 +1,6 @@
 <IfModule ssl_module>
 <VirtualHost *:443>
+    ServerName zoneminder zm
     SSLEngine on
 
     SSLCertificateFile /etc/ssl/apache2/zoneminder.crt
@@ -18,8 +19,7 @@
 </IfModule>
 
 <VirtualHost *:80>
-# allows opportunistic ssl upgrades (starttls on port 80 -very few clients use this)
-#   SSLEngine optional
+    ServerName zoneminder zm
 
     # logging configuration, this directory needs to be created
     ErrorLog /var/log/apache2/zoneminder_error_log

diff --git a/www-misc/zoneminder/files/zoneminder_vhost.include b/www-misc/zoneminder/files/zoneminder_vhost.include
@@ -5,10 +5,6 @@ ServerAdmin webmaster@localhost
 
 DocumentRoot "%ZM_WEBDIR%"
 
-## if you want to use SSL these need to be set to valid certificate & key
-#SSLCertificateFile
-#SSLCertificateKeyFile
-
 ## if zoneminder is the only thing on this named vhost you might want to
 ## redirect root / to /zm/ so you don't have to remember to type the path
 #RedirectMatch ^/$ /zm/