diff --git a/lib/Dobby/Boxmate/App/Command/ciplan.pm b/lib/Dobby/Boxmate/App/Command/ciplan.pm index 06fe082..b51c0db 100644 --- a/lib/Dobby/Boxmate/App/Command/ciplan.pm +++ b/lib/Dobby/Boxmate/App/Command/ciplan.pm @@ -38,6 +38,7 @@ sub _template_program { [ switch_to_branch => @switch_args ], [ debian_upgrade => () ], [ conf_update => () ], + [ htdocs_misc_install => () ], [ db_update => () ], [ knot_update => () ], [ cyrus_tmpfs => () ], diff --git a/misc/test-runner-on-vm b/misc/test-runner-on-vm index 49bd188..93a940f 100755 --- a/misc/test-runner-on-vm +++ b/misc/test-runner-on-vm @@ -333,9 +333,10 @@ sub STEP_knot_update ($self) { die "knot diff failed, exited $exitstatus"; } + # diffourdomains runs ME::CustomDNS updated code itself, but need to restart knot_sync to get updated code START("updating our domains in knot"); $self->run_cmd( - "(/home/mod_perl/hm/bin/robots/knot-update-our-domains --all --really; /home/mod_perl/hm/bin/humans/fmrbl rebuild; /home/mod_perl/hm/bin/robots/update_domain_common_fastmail_flag --really) 2>&1 | tee $root/knot-update.log", + "(/home/mod_perl/hm/utils/Services.pl knot_sync frestart; /home/mod_perl/hm/bin/robots/knot-update-our-domains --all --really; /home/mod_perl/hm/bin/humans/fmrbl rebuild; /home/mod_perl/hm/bin/robots/update_domain_common_fastmail_flag --really) 2>&1 | tee $root/knot-update.log", "knot update", ); } @@ -362,6 +363,18 @@ sub STEP_conf_update ($self) { return; } +sub STEP_htdocs_misc_install ($self) { + START("installing htdocs/misc"); + + my $root = $self->root; + $self->run_cmd( + "set -o pipefail; make -C /home/mod_perl/hm/htdocs/misc BRAND:=fastmail install 2>&1 | tee $root/htdocs-misc-install.log", + "htdocs/misc install", + ); + + return; +} + sub STEP_newt_full ($self, @args) { START("running Newt", 1); my $root = $self->root;