Updated ws.pm (minor httpd config changes, re-added its ipv6 address).

diff --git a/sources/ws.pm/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/ws.pm/c3d/firstboot/scripts/01_setupnetworking.sh
index 532cfdbe8e6c073dbf9c95a24a7d8b44227d8960..4c8f96f17c71d324c4b6f88e21e12172d35862cb 100755 (executable)
--- a/sources/ws.pm/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/ws.pm/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -62,23 +62,23 @@ CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
-#    ipv6.addresses "2a02:d400:0000:f2ad:000c:18ff:fe03:adf9/64" \
-#    ipv6.dns "2a02:d400:0000:f2ad:000c:18ff:fe03:adae" \
-#    ipv6.dns-search "pm.useribm.hu" \
-#    ipv6.method "manual" \
-#    ipv6.routes "2a02:d400:0000:f268::/64 2a02:d400:0000:f2ad:000c:18ff:fe03:ad01" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id perimeter \
     connection.interface-name $CONNECTION_DEVICE \
     connection.type 802-3-ethernet \
     ipv4.addresses "192.168.173.249/24" \
-    ipv4.dns "192.168.173.174" \
-    ipv4.dns-search "pm.user.hu" \
+    ipv4.dns "192.168.173.223" \
+    ipv4.dns-search "pm.useribm.hu" \
     ipv4.gateway "192.168.173.254" \
     ipv4.method "manual" \
     ipv4.routes "10.228.0.0/16 192.168.173.1, 192.168.42.0/24 192.168.173.1" \
-    ipv6.method "disabled" \
+    ipv6.addresses "2001:1aa1:000a:7c0c:000c:18ff:fe03:adf9/64" \
+    ipv6.dns "2001:1aa1:000a:7c0c:000c:18ff:fe03:addf" \
+    ipv6.dns-search "pm.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:7c0c:000c:18ff:fe03:adfe" \
+    ipv6.method "manual" \
+    ipv6.routes "2001:1aa1:000a:7dae::/64 2001:1aa1:000a:7c0c:000c:18ff:fe03:ad01" \
     save yes
 
 nmcli connection show

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 cf51efe6403efeae3f5af15a4d7c2f16bab6e063..eca64035f2be0385a1c1193e62933700f104f602 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
@@ -8,51 +8,51 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
     </Directory>
 
     ProxyPreserveHost On
-    ProxyPass /ugyvitel http://worksheet.sr.user.hu:8079/ugyvitel keepalive=On connectiontimeout=600
-    ProxyPassReverse /ugyvitel http://worksheet.sr.user.hu: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
+    RewriteEngine On
     RewriteRule ^/passwordchange$ /passwordchange/ [R,L]
-    <Location /passwordchange/>
+    <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/
+    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://xfr.pm.useribm.hu/avonxfr
-    ProxyPassReverse /avonxfr http://xfr.pm.useribm.hu/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://xfr.pm.useribm.hu/bbxfr
-    ProxyPassReverse /bbxfr http://xfr.pm.useribm.hu/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://xfr.pm.useribm.hu/erstexfr
-    ProxyPassReverse /erstexfr http://xfr.pm.useribm.hu/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://xfr.pm.useribm.hu/onyfxfr
-    ProxyPassReverse /onyfxfr http://xfr.pm.useribm.hu/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://xfr.pm.useribm.hu/ubisxfr
-    ProxyPassReverse /ubisxfr http://xfr.pm.useribm.hu/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://dvredmine.in.useribm.hu/
-    ProxyPassReverse /redmine http://dvredmine.in.useribm.hu/
+    ProxyPass "/redmine" "http://dvredmine.in.useribm.hu/"
+    ProxyPassReverse "/redmine" "http://dvredmine.in.useribm.hu/"
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -64,7 +64,7 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
@@ -82,7 +82,7 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
@@ -100,14 +100,14 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
     </Directory>
 
-    ProxyPass /jtrac http://192.168.43.210/jtrac
-    ProxyPassReverse /jtrac http://192.168.43.210/jtrac
+    ProxyPass "/jtrac" "http://192.168.43.210/jtrac"
+    ProxyPassReverse "/jtrac" "http://192.168.43.210/jtrac"
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -119,14 +119,14 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
     </Directory>
 
-    ProxyPass /minicrm http://minicrm.in.useribm.hu:8080/minicrm
-    ProxyPassReverse /minicrm http://minicrm.in.useribm.hu:8080/minicrm
+    ProxyPass "/minicrm" "http://minicrm.in.useribm.hu:8080/minicrm"
+    ProxyPassReverse "/minicrm" "http://minicrm.in.useribm.hu:8080/minicrm"
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -138,14 +138,14 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
     </Directory>
 
-    ProxyPass / http://10.228.62.193/
-    ProxyPassReverse / http://10.228.62.193/
+    ProxyPass "/" "http://10.228.62.193/"
+    ProxyPassReverse "/" "http://10.228.62.193/"
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -157,14 +157,14 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
     </Directory>
 
-    ProxyPass / http://store.in.useribm.hu/
-    ProxyPassReverse / http://store.in.useribm.hu/
+    ProxyPass "/" "http://store.in.useribm.hu/"
+    ProxyPassReverse "/" "http://store.in.useribm.hu/"
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -176,12 +176,12 @@
     SSLCertificateKeyFile /etc/letsencrypt/live/useribm/privkey.pem
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    <Directory /var/www/htdocs.useribm.hu.443>
+    <Directory "/var/www/htdocs.useribm.hu.443">
         <RequireAny>
             Require all granted
         </RequireAny>
     </Directory>
 
-    ProxyPass / http://wiki.in.useribm.hu/
-    ProxyPassReverse / http://wiki.in.useribm.hu/
+    ProxyPass "/" "http://wiki.in.useribm.hu/"
+    ProxyPassReverse "/" "http://wiki.in.useribm.hu/"
 </VirtualHost>

diff --git a/sources/ws.pm/c3d/postinstall/install-data/usr/local/bin/getletsencrypt.sh b/sources/ws.pm/c3d/postinstall/install-data/usr/local/bin/getletsencrypt.sh
index 54562d6d2931952495527bf50804cecc02dbf07c..76e0f707438ee7c3bba74021faab2fde43cd22a1 100755 (executable)
--- a/sources/ws.pm/c3d/postinstall/install-data/usr/local/bin/getletsencrypt.sh
+++ b/sources/ws.pm/c3d/postinstall/install-data/usr/local/bin/getletsencrypt.sh
@@ -34,7 +34,7 @@ then
 fi
 
 cp --archive \
-    /usr/lib/python3.11/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
+    /usr/lib/python3.12/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
     $LE_FP_DIRECTORY/options-ssl-apache.conf
 
 if [ -d $LE_DIRECTORY ]