https://git.useribm.hu / user-lxc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5afbba8)
Updated ifg.in and ws.pm (started configuration for store webdav).
authorZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Tue, 27 Jul 2021 14:13:17 +0000 (16:13 +0200)
committerZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Tue, 27 Jul 2021 14:13:17 +0000 (16:13 +0200)
scripts/dnf.conf.fedora patch | blob | history
sources/ifg.in/firstboot/nftables.config patch | blob | history
sources/ws.pm/firstboot/01_setupnetworking.sh patch | blob | history
sources/ws.pm/firstboot/10_certbot.sh patch | blob | history
sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.443.conf.le patch | blob | history
sources/ws.pm/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf patch | blob | history
sources/ws.pm/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le patch | blob | history

diff --git a/scripts/dnf.conf.fedora b/scripts/dnf.conf.fedora
index 328cc4e971704a0eb7c477b267f507d42457834e..df65ef984488aa137428843b48b503c685622b53 100644 (file)
--- a/scripts/dnf.conf.fedora
+++ b/scripts/dnf.conf.fedora
@@ -1,9 +1,9 @@
 [local-fedora]
 name=Fedora $releasever - $basearch
-baseurl=http://store.usr.user.hu/linux/fedora/releases/$releasever/Everything/$basearch/os/
+baseurl=http://store.in.useribm.hu/linux/fedora/releases/$releasever/Everything/$basearch/os/
 gpgcheck=0
 
 [local-updates]
 name=Fedora $releasever - $basearch - Updates
-baseurl=http://store.usr.user.hu/linux/fedora/updates/$releasever/Everything/$basearch/
+baseurl=http://store.in.useribm.hu/linux/fedora/updates/$releasever/Everything/$basearch/
 gpgcheck=0
diff --git a/sources/ifg.in/firstboot/nftables.config b/sources/ifg.in/firstboot/nftables.config
index 358dfe74e41033aea7b5cfe23a5736f5c7a88848..3b3b08ce67d3bd0997347a0eda721a834d7e51e4 100644 (file)
--- a/sources/ifg.in/firstboot/nftables.config
+++ b/sources/ifg.in/firstboot/nftables.config
@@ -50,6 +50,7 @@ define XFR_PERIMETER_IPV4 = 192.168.173.251
 
 # web server address (perimeter network)
 define WS_PERIMETER_IPV4 = 192.168.173.249
+define WS_PERIMETER_IPV6 = 2a02:d400:0000:f2ad:000c:18ff:fe03:adf9
 
 # perimeter name server address (perimeter network)
 define PNS_PERIMETER_IPV4 = 192.168.173.174
@@ -260,6 +261,28 @@ add rule ip ifg_filter forward \
     oifname $INTERNAL_IF \
     counter accept comment "Internal traffic"
 
+add rule ip ifg_filter forward \
+    ip protocol tcp \
+    iifname $PERIMETER_IF ip saddr $WS_PERIMETER_IPV4 tcp sport 1024-65535 \
+    oifname $INTERNAL_IF ip daddr $STORE_INTERNAL_IPV4 tcp dport 80 \
+    counter accept comment "Store requests"
+add rule ip6 ifg_filter forward \
+    iifname $PERIMETER_IF ip6 saddr $WS_PERIMETER_IPV6 tcp sport 1024-65535 \
+    oifname $INTERNAL_IF ip6 daddr $STORE_INTERNAL_IPV6 tcp dport 80 \
+    counter accept comment "Store requests"
+
+add rule ip ifg_filter forward \
+    ct state established \
+    ip protocol tcp \
+    iifname $INTERNAL_IF ip saddr $STORE_INTERNAL_IPV4 tcp sport 80 \
+    oifname $PERIMETER_IF ip daddr $WS_PERIMETER_IPV4 tcp dport 1024-65535 \
+    counter accept comment "Store replies"
+#add rule ip6 ifg_filter forward \
+#    ct state established \
+#    iifname $INTERNAL_IF ip6 saddr $STORE_INTERNAL_IPV6 tcp sport 80 \
+#    oifname $PERIMETER_IF ip6 daddr $WS_PERIMETER_IPV6 tcp dport 1024-65535 \
+#    counter accept comment "Store replies"
+
 add rule ip ifg_filter forward \
     ip protocol tcp \
     iifname $PERIMETER_IF ip saddr $WS_PERIMETER_IPV4 tcp sport 1024-65535 \
diff --git a/sources/ws.pm/firstboot/01_setupnetworking.sh b/sources/ws.pm/firstboot/01_setupnetworking.sh
index 62d9d8c2a25d74da3dd0d807fe58ca9bb203f6f2..b03ad51fae91dbc898d554f958ccb7e5fd91c577 100755 (executable)
--- a/sources/ws.pm/firstboot/01_setupnetworking.sh
+++ b/sources/ws.pm/firstboot/01_setupnetworking.sh
@@ -50,7 +50,11 @@ nmcli connection add \
     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 "auto" \
+    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" \
     save yes
 
 nmcli connection show
diff --git a/sources/ws.pm/firstboot/10_certbot.sh b/sources/ws.pm/firstboot/10_certbot.sh
index 470a796070634f132dd2219b1768022f837a2e12..2e5415902ab13997bd4f8a5d0a73aa40280aaae4 100755 (executable)
--- a/sources/ws.pm/firstboot/10_certbot.sh
+++ b/sources/ws.pm/firstboot/10_certbot.sh
@@ -18,6 +18,7 @@ certbot certonly \
         -d minicrm.userrendszerhaz.hu \
         -d redmine.useribm.hu \
         -d redmine.userrendszerhaz.hu \
+        -d store.useribm.hu \
         -d svn.useribm.hu \
         -d svn.userrendszerhaz.hu \
         -d useribm.hu \
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 8036631aba7a61ec357ba527478da3d50957677e..dde4e8187674e3fdf1f9fa0cdb2e7f3c2377d625 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
@@ -37,13 +37,9 @@
     ProxyPass /ubisxfr http://192.168.173.251/ubisxfr
     ProxyPassReverse /ubisxfr http://192.168.173.251/ubisxfr
 
-    # dvasary's redmine -> dvredmine.usr.user.hu:80
+    # dvasary's redmine -> dvredmine.in.useribm.hu:80
     ProxyPass /redmine http://10.228.62.193/
     ProxyPassReverse /redmine http://10.228.62.193/
-
-    # webdav store -> store.usr.user.hu:80
-    #ProxyPass /store http://store.usr.user.hu/
-    #ProxyPassReverse /store http://store.usr.user.hu/
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -95,8 +91,8 @@
         </RequireAny>
     </Directory>
 
-    ProxyPass /minicrm http://minicrm.usr.user.hu:8080/minicrm
-    ProxyPassReverse /minicrm http://minicrm.usr.user.hu:8080/minicrm
+    ProxyPass /minicrm http://minicrm.in.useribm.hu:8080/minicrm
+    ProxyPassReverse /minicrm http://minicrm.in.useribm.hu:8080/minicrm
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -116,3 +112,21 @@
     ProxyPass / http://10.228.62.193/
     ProxyPassReverse / http://10.228.62.193/
 </VirtualHost>
+
+<VirtualHost *:443>
+    ServerName store.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://store.in.useribm.hu/
+    ProxyPassReverse / http://store.in.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 cc36dcdaa5c3d730d3c03a58b66a430886b593dd..99502c591b9b52c60288ddb196f3a1ee1b19991c 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
@@ -54,3 +54,17 @@
 
     Redirect permanent / https://redmine.useribm.hu/
 </VirtualHost>
+
+<VirtualHost *:80>
+    ServerName store.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://store.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 80dce71830acf3e1d86c9714edba58b783e725ff..1a38da098ec5ba7dcb7ec436f2a92c2eca56aee8 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
@@ -33,13 +33,9 @@
     ProxyPass /ubisxfr http://192.168.173.251/ubisxfr
     ProxyPassReverse /ubisxfr http://192.168.173.251/ubisxfr
 
-    # dvasary's redmine -> dvredmine.usr.user.hu:80
+    # dvasary's redmine -> dvredmine.in.useribm.hu:80
     ProxyPass /redmine http://10.228.62.193/
     ProxyPassReverse /redmine http://10.228.62.193/
-
-    # webdav store -> store.usr.user.hu:80
-    #ProxyPass /store http://store.usr.user.hu/
-    #ProxyPassReverse /store http://store.usr.user.hu/
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -91,8 +87,8 @@
         </RequireAny>
     </Directory>
 
-    ProxyPass /minicrm http://minicrm.usr.user.hu:8080/minicrm
-    ProxyPassReverse /minicrm http://minicrm.usr.user.hu:8080/minicrm
+    ProxyPass /minicrm http://minicrm.in.useribm.hu:8080/minicrm
+    ProxyPassReverse /minicrm http://minicrm.in.useribm.hu:8080/minicrm
 </VirtualHost>
 
 <VirtualHost *:443>
user-lxc repository