diff --git a/deploy.pl b/deploy.pl index 85f2dfd..2301504 100755 --- a/deploy.pl +++ b/deploy.pl @@ -24,11 +24,12 @@ # 2019/09/29 added: doas.conf for pkill option # 2020/05/10 changed: includes all install sets, inline with sysupgrade # 2020/05/22 changed: set the hosts password for the users -# 2020/05/24 changed: add staggered option to vm.conf, leave disable for now -# 2020/09/20 changed: add agentx option to vm.conf for OpenBSD 7.0 +# 2020/05/24 added: staggered option to vm.conf, leave disable for now +# 2020/09/20 added: agentx option to vm.conf for OpenBSD 7.2 # 2020/10/25 changes: doas.conf for pkill option, so it works again -# 2021/01/19 changes: add format of disk images in vm.conf (CVE-2010-3851), thanx Johan Finnved -# 2021/05/18 changes: restrict the install.conf files in /var/www +# 2021/01/19 added: format of disk images in vm.conf (CVE-2010-3851), thanx Johan Finnved +# 2021/05/18 changed: restrict the install.conf files in /var/www +# 2021/08/29 added: next-server to dhcpd.conf, reliable pull of install.conf # use 5.024; use strict; @@ -85,7 +86,7 @@ sub render_vm_conf { printf $fh_vm "#\n# File generated by deploy.pl\n#\n"; printf $fh_vm "socket owner :%s\n", $conf{'conf'}{'VMDUSERS'}; printf $fh_vm "staggered start parallel 2 delay 90\n"; - if ($_VERSION > 6.9) { + if ($_VERSION > 7.1) { printf $fh_vm "agentx\n"; } printf $fh_vm "\n"; @@ -164,6 +165,7 @@ sub render_dhcpd_conf { } else { printf $fh_dhcpd "\t\tfilename \"auto_upgrade\";\n"; } + printf $fh_dhcpd "\t\tnext-server %s.%s;\n", $conf{'conf'}{'SERVER'}, $conf{'conf'}{'DOMAIN'}; printf $fh_dhcpd "\t\toption host-name \"%s\";\n", $_hostname; printf $fh_dhcpd "\t}\n"; } diff --git a/sync-it.sh b/sync-it.sh index a960bb3..1660144 100755 --- a/sync-it.sh +++ b/sync-it.sh @@ -15,4 +15,4 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OPTIONS=${1:--qa} -/usr/local/bin/rsync ${OPTIONS} /etc /home/mischa /var/nsd /var/unbound /var/www n2.high5.nl::obsdams/$(hostname -s) --del +/usr/local/bin/rsync ${OPTIONS} /etc /home/mischa /var/cron /var/nsd /var/unbound /var/www n2.high5.nl::obsdams/$(hostname -s) --del