Updated ws.pm (added git forwarding to httpd configuration).

diff --git a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.443.conf.le b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.443.conf.le
index 7cd079d1cb7407f8300fc155cdf759ddac35eda3..7df4fde85d67fd17816e01d08a55e35db7cd2943 100644 (file)
--- a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.443.conf.le
+++ b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.443.conf.le
@@ -42,6 +42,23 @@
     ProxyPassReverse /redmine http://10.228.62.193/
 </VirtualHost>
 
+<VirtualHost *:443>
+    ServerName git.useribm.hu
+    ServerAdmin webadmin@useribm.hu
+    DocumentRoot "/var/www/htdocs.useribm.hu.443"
+
+    SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
+
+    <Directory /var/www/htdocs.useribm.hu.443>
+        <RequireAny>
+            Require all granted
+        </RequireAny>
+    </Directory>
+
+    ProxyPass "/" "http://git.pm.user.hu/"
+</VirtualHost>
+
 <VirtualHost *:443>
     ServerName hg.useribm.hu
     ServerAdmin webadmin@useribm.hu
@@ -56,7 +73,7 @@
         </RequireAny>
     </Directory>
 
-    ProxyPass "/" "http://hg.pm.user.hu/jtrac"
+    ProxyPass "/" "http://hg.pm.user.hu/"
 </VirtualHost>
 
 <VirtualHost *:443>

diff --git a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf
index c4b9060b6d8c5dd105e9c75251709f3a4bfe54c3..92b15a6b2c06ed1b5b6f67c152de2c387fddec97 100644 (file)
--- a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf
+++ b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf
@@ -13,6 +13,20 @@
     Redirect permanent / https://www.useribm.hu/
 </VirtualHost>
 
+<VirtualHost *:80>
+    ServerName git.useribm.hu
+    ServerAdmin webadmin@useribm.hu
+    DocumentRoot "/var/www/htdocs.useribm.hu.80"
+
+    <Directory /var/www/htdocs.useribm.hu.80>
+        <RequireAny>
+            Require all granted
+        </RequireAny>
+    </Directory>
+
+    Redirect permanent / https://git.useribm.hu/
+</VirtualHost>
+
 <VirtualHost *:80>
     ServerName jtrac.useribm.hu
     ServerAdmin webadmin@useribm.hu

diff --git a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le
index d9ef6a01d133d62e8ebd7632675526942273f614..5178f880c5a198a91cba4892f5f00daff8e38df0 100644 (file)
--- a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le
+++ b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le
@@ -38,6 +38,23 @@
     ProxyPassReverse /redmine http://10.228.62.193/
 </VirtualHost>
 
+<VirtualHost *:443>
+    ServerName git.userrendszerhaz.hu
+    ServerAdmin webadmin@userrendszerhaz.hu
+    DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.443"
+
+    SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
+
+    <Directory /var/www/htdocs.userrendszerhaz.hu.443>
+        <RequireAny>
+            Require all granted
+        </RequireAny>
+    </Directory>
+
+    ProxyPass "/" "http://git.pm.user.hu/"
+</VirtualHost>
+
 <VirtualHost *:443>
     ServerName hg.userrendszerhaz.hu
     ServerAdmin webadmin@userrendszerhaz.hu
@@ -52,7 +69,7 @@
         </RequireAny>
     </Directory>
 
-    ProxyPass "/" "http://hg.pm.user.hu/jtrac"
+    ProxyPass "/" "http://hg.pm.user.hu/"
 </VirtualHost>
 
 <VirtualHost *:443>

diff --git a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf
index 8d4119b5d878b16fbd7061750eda4f607db6add1..b90204c3cd2fd64cb5e86f378c80b1ea837e7a0f 100644 (file)
--- a/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf
+++ b/sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf
@@ -13,6 +13,20 @@
     Redirect permanent / https://www.userrendszerhaz.hu/
 </VirtualHost>
 
+<VirtualHost *:80>
+    ServerName git.userrendszerhaz.hu
+    ServerAdmin webadmin@userrendszerhaz.hu
+    DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.80"
+
+    <Directory /var/www/htdocs.userrendszerhaz.hu.80>
+        <RequireAny>
+            Require all granted
+        </RequireAny>
+    </Directory>
+
+    Redirect permanent / https://git.userrendszerhaz.hu/
+</VirtualHost>
+
 <VirtualHost *:80>
     ServerName jtrac.userrendszerhaz.hu
     ServerAdmin webadmin@userrendszerhaz.hu