Updated ws.pm (passwordchange.useribm.hu -> www.useribm.hu/passwordchange).

diff --git a/sources/ws.pm/c3d/postinstall/install-data/etc/httpd/conf.d/useribm.hu.443.conf.le b/sources/ws.pm/c3d/postinstall/install-data/etc/httpd/conf.d/useribm.hu.443.conf.le
index cd7b221fe433b302633b54750f0e8a83c56aac7c..cf51efe6403efeae3f5af15a4d7c2f16bab6e063 100644 (file)
--- a/sources/ws.pm/c3d/postinstall/install-data/etc/httpd/conf.d/useribm.hu.443.conf.le
+++ b/sources/ws.pm/c3d/postinstall/install-data/etc/httpd/conf.d/useribm.hu.443.conf.le
@@ -15,32 +15,44 @@
     </Directory>
 
     ProxyPreserveHost On
-    ProxyPass /ugyvitel http://192.168.42.248:8079/ugyvitel keepalive=On connectiontimeout=600
-    ProxyPassReverse /ugyvitel http://192.168.42.248:8079/ugyvitel
+    ProxyPass /ugyvitel http://worksheet.sr.user.hu:8079/ugyvitel keepalive=On connectiontimeout=600
+    ProxyPassReverse /ugyvitel http://worksheet.sr.user.hu:8079/ugyvitel
+
+    RewriteEngine on
+    RewriteRule ^/passwordchange$ /passwordchange/ [R,L]
+    <Location /passwordchange/>
+        <RequireAny>
+            Require all granted
+            #Require ip 10.228.0.0/16
+            #Require ip 172.16.223.0/24
+        </RequireAny>
+    </Location>
+    ProxyPass /passwordchange/ http://fdc.in.useribm.hu/
+    ProxyPassReverse /passwordchange/ http://fdc.in.useribm.hu/
 
     # avon file transfer -> xfr.pm.useribm.hu:80
-    ProxyPass /avonxfr http://192.168.173.251/avonxfr
-    ProxyPassReverse /avonxfr http://192.168.173.251/avonxfr
+    ProxyPass /avonxfr http://xfr.pm.useribm.hu/avonxfr
+    ProxyPassReverse /avonxfr http://xfr.pm.useribm.hu/avonxfr
 
     # bb file transfer -> xfr.pm.useribm.hu:80
-    ProxyPass /bbxfr http://192.168.173.251/bbxfr
-    ProxyPassReverse /bbxfr http://192.168.173.251/bbxfr
+    ProxyPass /bbxfr http://xfr.pm.useribm.hu/bbxfr
+    ProxyPassReverse /bbxfr http://xfr.pm.useribm.hu/bbxfr
 
     # erste file transfer -> xfr.pm.useribm.hu:80
-    ProxyPass /erstexfr http://192.168.173.251/erstexfr
-    ProxyPassReverse /erstexfr http://192.168.173.251/erstexfr
+    ProxyPass /erstexfr http://xfr.pm.useribm.hu/erstexfr
+    ProxyPassReverse /erstexfr http://xfr.pm.useribm.hu/erstexfr
 
     # onyf file transfer -> xfr.pm.useribm.hu:80
-    ProxyPass /onyfxfr http://192.168.173.251/onyfxfr
-    ProxyPassReverse /onyfxfr http://192.168.173.251/onyfxfr
+    ProxyPass /onyfxfr http://xfr.pm.useribm.hu/onyfxfr
+    ProxyPassReverse /onyfxfr http://xfr.pm.useribm.hu/onyfxfr
 
     # ubis file transfer -> xfr.pm.useribm.hu:80
-    ProxyPass /ubisxfr http://192.168.173.251/ubisxfr
-    ProxyPassReverse /ubisxfr http://192.168.173.251/ubisxfr
+    ProxyPass /ubisxfr http://xfr.pm.useribm.hu/ubisxfr
+    ProxyPassReverse /ubisxfr http://xfr.pm.useribm.hu/ubisxfr
 
     # dvasary's redmine -> dvredmine.in.useribm.hu:80
-    ProxyPass /redmine http://10.228.62.193/
-    ProxyPassReverse /redmine http://10.228.62.193/
+    ProxyPass /redmine http://dvredmine.in.useribm.hu/
+    ProxyPassReverse /redmine http://dvredmine.in.useribm.hu/
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -117,27 +129,6 @@
     ProxyPassReverse /minicrm http://minicrm.in.useribm.hu:8080/minicrm
 </VirtualHost>
 
-<VirtualHost *:443>
-    ServerName passwordchange.useribm.hu
-    ServerAdmin webadmin@useribm.hu
-    DocumentRoot "/var/www/htdocs.useribm.hu.443"
-
-    SSLCertificateFile /etc/letsencrypt/live/useribm/fullchain.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
-
-    <Directory /var/www/htdocs.useribm.hu.443>
-        <RequireAny>
-            Require all granted
-            #Require ip 10.228.0.0/16
-            #Require ip 172.16.223.0/24
-        </RequireAny>
-    </Directory>
-
-    ProxyPass / http://fdc.in.useribm.hu/
-    ProxyPassReverse / http://fdc.in.useribm.hu/
-</VirtualHost>
-
 <VirtualHost *:443>
     ServerName redmine.useribm.hu
     ServerAdmin webadmin@useribm.hu