From 22feca63028c634422a80328e95bfdc163499c82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Wed, 19 Feb 2020 14:43:39 +0100 Subject: [PATCH] Updated pns.usr (added zft320) and ws.pm (removed nonexistent letsencrypt include). --- .../postinstall/install/var/named/228.10.in-addr.arpa.zone | 6 +++--- .../pns.usr/postinstall/install/var/named/usr.user.hu.zone | 5 +++-- .../install/etc/httpd/conf.d/useribm.hu.443.conf.le | 5 ----- .../install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le | 5 ----- 4 files changed, 6 insertions(+), 15 deletions(-) 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 1d99bdb..aef8ec8 100644 --- 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 a3664e8..12c922b 100644 --- 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 e6a998f..21fe0eb 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 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 54247c7..80dce71 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 -- 2.54.0