diff options
| -rw-r--r-- | dns_wizard/Bind.pm | 11 | ||||
| -rw-r--r-- | dns_wizard/Makefile | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm index fc5c2826..01ac76a7 100644 --- a/dns_wizard/Bind.pm +++ b/dns_wizard/Bind.pm @@ -56,12 +56,6 @@ my $ZONE_DIR = $NAMED_DIR . "/zone"; my $DATE = `date +%d-%m-20%y`; my $WIZARD_SCRIPTS = "/usr/share/wizards/dns_wizard/scripts"; -if (!-f "$NAMED_DIR/named.ca") { - cp_af("$WIZARD_SCRIPTS/named.ca","$NAMED_DIR/named.ca"); - cp_af("$WIZARD_SCRIPTS/master","$NAMED_DIR/"); - cp_af("$WIZARD_SCRIPTS/reverse","$NAMED_DIR/"); -} - my $o = { name => 'DNS Configuration Wizard', var => { @@ -807,6 +801,11 @@ sub check_iph { sub do_it { $::testing and return; + if (!-f "$NAMED_DIR/named.ca") { + cp_af("$WIZARD_SCRIPTS/named.ca","$NAMED_DIR/named.ca"); + cp_af("$WIZARD_SCRIPTS/master","$NAMED_DIR/"); + cp_af("$WIZARD_SCRIPTS/reverse","$NAMED_DIR/"); + } #my ($st) = @_; crea_wdir($WDIR); # create files diff --git a/dns_wizard/Makefile b/dns_wizard/Makefile index ddb080e3..1ce37927 100644 --- a/dns_wizard/Makefile +++ b/dns_wizard/Makefile @@ -6,10 +6,14 @@ install: mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/dns_wizard mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/dns_wizard/scripts + mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/dns_wizard/scripts/master + mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/dns_wizard/scripts/reverse mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/dns_wizard/images install --mode=u=rw,g=r,o=r -p dns.wiz ${prefix}/share/wizards/dns_wizard install --mode=a=r -p ./images/DNS.png ${prefix}/share/wizards/dns_wizard/images install --mode=u=rw,g=r,o=r -p scripts/Dnsconf.pm ${prefix}/share/wizards/dns_wizard/scripts install --mode=u=rwx,g=rx,o=rx -p scripts/*.sh ${prefix}/share/wizards/dns_wizard/scripts install --mode=u=rwx,g=rx,o=rx -p scripts/*.default ${prefix}/share/wizards/dns_wizard/scripts - + install --mode=u=rwx,g=rx,o=rx -p scripts/*.ca ${prefix}/share/wizards/dns_wizard/scripts + install --mode=u=rwx,g=rx,o=rx -p scripts/master/* ${prefix}/share/wizards/dns_wizard/scripts/master + install --mode=u=rwx,g=rx,o=rx -p scripts/reverse/* ${prefix}/share/wizards/dns_wizard/scripts/reverse |