From dac5661a216be4ee128b7ab7b8bb29fc3d7ec633 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Tue, 14 Dec 2021 12:46:54 +0100 Subject: [PATCH] Updated pns.in and ws.pm (added wiki server). --- .../var/named/173.168.192.in-addr.arpa.zone | 3 +- .../install/var/named/pm.useribm.hu.zone | 2 +- .../install/var/named/useribm.hu.zone | 1 + .../install/var/named/userrendszerhaz.hu.zone | 1 + sources/ws.pm/firstboot/10_certbot.sh | 4 ++- .../etc/httpd/conf.d/useribm.hu.443.conf.le | 18 ++++++++++ .../etc/httpd/conf.d/useribm.hu.80.conf | 14 ++++++++ .../conf.d/userrendszerhaz.hu.443.conf.le | 36 +++++++++++++++++++ .../httpd/conf.d/userrendszerhaz.hu.80.conf | 28 +++++++++++++++ 9 files changed, 104 insertions(+), 3 deletions(-) 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 7951953..3b432f8 100644 --- 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 da6dd09..3cea907 100644 --- 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 6f7c2bc..6608b13 100644 --- 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 1fb6543..d39ea07 100644 --- 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 2e54159..322dc44 100755 --- 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 dde4e81..ed51d7c 100644 --- 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/ + + + 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 + + + + Require all granted + + + + ProxyPass / http://wiki.pm.useribm.hu/ + ProxyPassReverse / http://wiki.pm.useribm.hu/ + 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 99502c5..c4b9060 100644 --- 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/ + + + ServerName wiki.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.80" + + + + Require all granted + + + + Redirect permanent / https://wiki.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 1a38da0..d9ef6a0 100644 --- 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/ + + + 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 + + + + Require all granted + + + + ProxyPass / http://store.in.useribm.hu/ + ProxyPassReverse / http://store.in.useribm.hu/ + + + + 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 + + + + Require all granted + + + + ProxyPass / http://wiki.pm.useribm.hu/ + ProxyPassReverse / http://wiki.pm.useribm.hu/ + 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 e837293..8d4119b 100644 --- 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/ + + + ServerName store.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.80" + + + + Require all granted + + + + Redirect permanent / https://store.userrendszerhaz.hu/ + + + + ServerName wiki.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.80" + + + + Require all granted + + + + Redirect permanent / https://wiki.userrendszerhaz.hu/ + -- 2.54.0