Updated pns.in and ws.pm (added wiki server).

diff --git a/sources/pns.in/postinstall/install/var/named/173.168.192.in-addr.arpa.zone b/sources/pns.in/postinstall/install/var/named/173.168.192.in-addr.arpa.zone
index 79519531c59246ec213109a88cb237ba6608c04b..3b432f8d62a75dea6686fc8c994e754c3816a371 100644 (file)
--- a/sources/pns.in/postinstall/install/var/named/173.168.192.in-addr.arpa.zone
+++ b/sources/pns.in/postinstall/install/var/named/173.168.192.in-addr.arpa.zone
@@ -1,6 +1,6 @@
 $TTL   86400
 @      IN      SOA     pns.pm.useribm.hu.      hostmaster.mx.pm.useribm.hu.    (
-                                       2021031701      ; Serial
+                                       2021121001      ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)
@@ -16,6 +16,7 @@ $TTL  86400
 223            IN      PTR     vc.pm.useribm.hu.
 193            IN      PTR     dvredmine.pm.useribm.hu.
 174            IN      PTR     pns.pm.useribm.hu.
+153            IN      PTR     wiki.pm.useribm.hu.
 64             IN      PTR     ens.pm.useribm.hu.
 
 1              IN      PTR     ifg.pm.useribm.hu.

diff --git a/sources/pns.in/postinstall/install/var/named/pm.useribm.hu.zone b/sources/pns.in/postinstall/install/var/named/pm.useribm.hu.zone
index da6dd095d9bd15ab178e540da47325bd4d895a1b..3cea907df5cba1822dbd5ab3f2e5a322968606bd 100644 (file)
--- a/sources/pns.in/postinstall/install/var/named/pm.useribm.hu.zone
+++ b/sources/pns.in/postinstall/install/var/named/pm.useribm.hu.zone
@@ -1,6 +1,6 @@
 $TTL   86400
 @      IN      SOA     pns.pm.useribm.hu.      hostmaster.mx.pm.useribm.hu.    (
-                                       2021120901      ; Serial
+                                       2021121001      ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)

diff --git a/sources/pns.in/postinstall/install/var/named/useribm.hu.zone b/sources/pns.in/postinstall/install/var/named/useribm.hu.zone
index 6f7c2bce0295245797a4c46ccf92d9211b9947f9..6608b13b7aad1da59a3a7fa7c81d8c58ef169363 100644 (file)
--- a/sources/pns.in/postinstall/install/var/named/useribm.hu.zone
+++ b/sources/pns.in/postinstall/install/var/named/useribm.hu.zone
@@ -38,6 +38,7 @@ minicrm               IN      A       37.220.137.101  ; minicrm
 redmine                IN      A       37.220.137.101  ; redmine
 store          IN      A       37.220.137.101  ; store
 svn            IN      A       37.220.137.101  ; subversion
+wiki           IN      A       37.220.137.101  ; wiki server
 ws             IN      A       37.220.137.101  ; web server
 www            IN      A       37.220.137.101  ; web server
 @              IN      A       37.220.137.101  ; useribm.hu

diff --git a/sources/pns.in/postinstall/install/var/named/userrendszerhaz.hu.zone b/sources/pns.in/postinstall/install/var/named/userrendszerhaz.hu.zone
index 1fb6543092d4c800117fc639f8f02bcec4b59737..d39ea07cff7d5c718ecc87bc2f70c18b61d43dc1 100644 (file)
--- a/sources/pns.in/postinstall/install/var/named/userrendszerhaz.hu.zone
+++ b/sources/pns.in/postinstall/install/var/named/userrendszerhaz.hu.zone
@@ -41,6 +41,7 @@ jtrac         IN      A       37.220.137.101  ; jtrac
 minicrm                IN      A       37.220.137.101  ; minicrm
 redmine                IN      A       37.220.137.101  ; redmine
 svn            IN      A       37.220.137.101  ; subversion
+wiki           IN      A       37.220.137.101  ; wiki server
 ws             IN      A       52.178.40.45    ; web server
 www            IN      A       52.178.40.45    ; web server
 @              IN      A       52.178.40.45    ; userrendszerhaz.hu

diff --git a/sources/ws.pm/firstboot/10_certbot.sh b/sources/ws.pm/firstboot/10_certbot.sh
index 2e5415902ab13997bd4f8a5d0a73aa40280aaae4..322dc445b7c27c99bc0e9e893aecf8499bfa15ae 100755 (executable)
--- a/sources/ws.pm/firstboot/10_certbot.sh
+++ b/sources/ws.pm/firstboot/10_certbot.sh
@@ -21,6 +21,8 @@ certbot certonly \
         -d store.useribm.hu \
         -d svn.useribm.hu \
         -d svn.userrendszerhaz.hu \
+        -d wiki.useribm.hu \
+        -d wiki.userrendszerhaz.hu \
         -d useribm.hu \
         -d www.useribm.hu \
         -m zoltan.felleg@userrendszerhaz.hu
@@ -35,7 +37,7 @@ then
     done
     /usr/bin/cp \
         --archive \
-        /usr/lib/python3.9/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
+        /usr/lib/python3.10/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
         /etc/letsencrypt/options-ssl-apache.conf
     systemctl enable certbot-renew.timer
     systemctl start certbot-renew.timer

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 dde4e8187674e3fdf1f9fa0cdb2e7f3c2377d625..ed51d7c5494530a358300f5969dcf9caa99f45cc 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
@@ -130,3 +130,21 @@
     ProxyPass / http://store.in.useribm.hu/
     ProxyPassReverse / http://store.in.useribm.hu/
 </VirtualHost>
+
+<VirtualHost *:443>
+    ServerName wiki.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://wiki.pm.useribm.hu/
+    ProxyPassReverse / http://wiki.pm.useribm.hu/
+</VirtualHost>

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 99502c591b9b52c60288ddb196f3a1ee1b19991c..c4b9060b6d8c5dd105e9c75251709f3a4bfe54c3 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
@@ -68,3 +68,17 @@
 
     Redirect permanent / https://store.useribm.hu/
 </VirtualHost>
+
+<VirtualHost *:80>
+    ServerName wiki.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://wiki.useribm.hu/
+</VirtualHost>

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 1a38da098ec5ba7dcb7ec436f2a92c2eca56aee8..d9ef6a01d133d62e8ebd7632675526942273f614 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
@@ -108,3 +108,39 @@
     ProxyPass / http://10.228.62.193/
     ProxyPassReverse / http://10.228.62.193/
 </VirtualHost>
+
+<VirtualHost *:443>
+    ServerName store.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://store.in.useribm.hu/
+    ProxyPassReverse / http://store.in.useribm.hu/
+</VirtualHost>
+
+<VirtualHost *:443>
+    ServerName wiki.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://wiki.pm.useribm.hu/
+    ProxyPassReverse / http://wiki.pm.useribm.hu/
+</VirtualHost>

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 e837293db8d865ad8c3086a28ff1e5795d60ad7e..8d4119b5d878b16fbd7061750eda4f607db6add1 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
@@ -54,3 +54,31 @@
 
     Redirect permanent / https://redmine.userrendszerhaz.hu/
 </VirtualHost>
+
+<VirtualHost *:80>
+    ServerName store.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://store.userrendszerhaz.hu/
+</VirtualHost>
+
+<VirtualHost *:80>
+    ServerName wiki.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://wiki.userrendszerhaz.hu/
+</VirtualHost>