https://git.useribm.hu / user-lxc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25d157b)
Updated pns.usr (added zft320) and ws.pm (removed nonexistent letsencrypt include).
authorZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Wed, 19 Feb 2020 13:43:39 +0000 (14:43 +0100)
committerZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Wed, 19 Feb 2020 13:43:39 +0000 (14:43 +0100)
sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone patch | blob | history
sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone 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/userrendszerhaz.hu.443.conf.le patch | blob | history

diff --git a/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone b/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone
index 1d99bdb1ed304af481e0a8d92afe6a3e29e686f0..aef8ec80bfba884cc5a599a2255a93c1329be4f8 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone
+++ b/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone
@@ -1,6 +1,6 @@
 $TTL   86400
 @      IN      SOA     ns.usr.user.hu. hostmaster.mx.usr.user.hu.      (
-                                       2020012701      ; Serial
+                                       2020020701      ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)
@@ -323,11 +323,12 @@ $GENERATE 100-254 $.43    IN      PTR     dhcp$.usr.user.hu.
 236.10         IN      PTR     zfvpn.usr.user.hu.
 234.10         IN      PTR     zfwd.usr.user.hu.
 223.10         IN      PTR     zfvc.usr.user.hu.
-149.10         IN      PTR     zfmssql.usr.user.hu.
+178.10         IN      PTR     zft320idrac.usr.user.hu.
 140.10         IN      PTR     zfdl380eilo.usr.user.hu.
 138.10         IN      PTR     zfdl360eilo.usr.user.hu.
 90.10          IN      PTR     zfdl380e.usr.user.hu.
 88.10          IN      PTR     zfdl360e.usr.user.hu.
+84.10          IN      PTR     zft320.usr.user.hu.
 48.10          IN      PTR     zfdevrhel8b.usr.user.hu.
 47.10          IN      PTR     zfdevrhel7.usr.user.hu.
 28.10          IN      PTR     zfbldw2k08.usr.user.hu.
@@ -335,6 +336,5 @@ $GENERATE   100-254 $.43    IN      PTR     dhcp$.usr.user.hu.
 26.10          IN      PTR     zfbldrhel6.usr.user.hu.
 22.10          IN      PTR     zfboinc2.usr.user.hu.
 21.10          IN      PTR     zfboinc1.usr.user.hu.
-8.10           IN      PTR     zft320.usr.user.hu.
 7.10           IN      PTR     zfwin7.usr.user.hu.
 3.10           IN      PTR     zfryzen.usr.user.hu.
diff --git a/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone b/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone
index a3664e81574bd44e28d882a203fcb34e8edc8a7a..12c922b9f876f89778b19e23df682343779219b2 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone
+++ b/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone
@@ -1,6 +1,6 @@
 $TTL   86400
 @      IN      SOA     ns.usr.user.hu. hostmaster.mx.usr.user.hu.      (
-                                       2020012701      ; Serial
+                                       2020020701      ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)
@@ -333,10 +333,12 @@ zfws              IN      A       10.228.10.249   ; ws
 zfvpn          IN      A       10.228.10.236   ; vp
 zfwd           IN      A       10.228.10.234   ; wd
 zfvc           IN      A       10.228.10.223   ; vc
+zft320idrac    IN      A       10.228.10.178   ; id + t + 320 (mod256)
 zfdl380eilo    IN      A       10.228.10.140   ; il + 38
 zfdl360eilo    IN      A       10.228.10.138   ; il + 36
 zfdl380e       IN      A       10.228.10.90    ; dl + 38
 zfdl360e       IN      A       10.228.10.88    ; dl + 36
+zft320         IN      A       10.228.10.84    ; t + 320 (mod256)
 zfdevrhel8b    IN      A       10.228.10.48    ; d8
 zfdevrhel7     IN      A       10.228.10.47    ; d7
 zfbldw2k08     IN      A       10.228.10.28    ; b8
@@ -344,7 +346,6 @@ zfbldrhel7  IN      A       10.228.10.27    ; b7
 zfbldrhel6     IN      A       10.228.10.26    ; b6
 zfboinc2       IN      A       10.228.10.22
 zfboinc1       IN      A       10.228.10.21
-zft320         IN      A       10.228.10.8     ; t + 320 (mod256)
 zfwin7         IN      A       10.228.10.7
 zfryzen                IN      A       10.228.10.3     ; ryzen 2400G
 zfblu-r1-hd    IN      A       10.228.10.2
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 e6a998f2ca89c94fa09e1a4327e6e0a1a031e56a..21fe0eb6cdf15e63a395665b578a5fd7180418c3 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
@@ -6,7 +6,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.useribm.hu.443>
         <RequireAny>
@@ -50,7 +49,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.useribm.hu.443>
         <RequireAny>
@@ -68,7 +66,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.useribm.hu.443>
         <RequireAny>
@@ -87,7 +84,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.useribm.hu.443>
         <RequireAny>
@@ -106,7 +102,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.useribm.hu.443>
         <RequireAny>
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 54247c79f544e0a7aec03df93e22656b7c0710a0..80dce71830acf3e1d86c9714edba58b783e725ff 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
@@ -6,7 +6,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.userrendszerhaz.hu.443>
         <RequireAny>
@@ -50,7 +49,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.userrendszerhaz.hu.443>
         <RequireAny>
@@ -68,7 +66,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.userrendszerhaz.hu.443>
         <RequireAny>
@@ -87,7 +84,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.userrendszerhaz.hu.443>
         <RequireAny>
@@ -106,7 +102,6 @@
 
     SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem
     SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
 
     <Directory /var/www/htdocs.userrendszerhaz.hu.443>
         <RequireAny>
user-lxc repository