fix apache

fix dns_client adding a \n at the end of the line of the configuration file
fix squid
fix inn
fix ftp
fix samba
add a init function in drakwizard.pl for case such as apache which need to initialize some parameters
separate region/country in ntp wizard

1 files changed, 6 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 3e709474..b633a707 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ PERL_VENDORLIB=$(shell eval "`perl -V:installvendorlib`"; installvendorlib=$${in
 
 WIZ =   dhcp_wizard\
 	client_wizard\
-	server_wizard\
 	dns_wizard\
 	postfix_wizard\
 	samba_wizard\
@@ -31,7 +30,7 @@ install:
 	mkdir -p ${prefix}/sbin
 	mkdir -p ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard/
 	install -p drakwizard.pl ${prefix}/sbin/drakwizard
-	perl -i -pe "s,(__WIZ_HOME__|\i\\$$ENV{__WIZ_HOME__}),$(WIZ_HOME),g" ${prefix}/sbin/drakwizard 
+	perl -i -pe "s,(__WIZ_HOME__|\\\$$ENV{__WIZ_HOME__}),$(WIZ_HOME),g" ${prefix}/sbin/drakwizard 
 	perl -i -pe "s|new IFCFG|new MDK::Wizard::IFCFG|g" common/Wizcommon.pm
 	for l in $(OTHER); do \
 	        $(MAKE) -C $$l $@; \
@@ -41,7 +40,12 @@ install:
 	        install --mode=u=rwx,g=rx,o=rx -d ${prefix}/share/wizards/$$l/images/; \
 	        install --mode=u=rw,g=r,o=r -p $$l/*.pm ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard/; \
 	        install --mode=a=r -p $$l/images/*.png ${prefix}/share/wizards/$$l/images; \
+		if ls $$l/scripts/*.default &> /dev/null ; then \
+	            install --mode=u=rwx,g=rx,o=rx -d ${prefix}/share/wizards/$$l/scripts/; \
+	            install --mode=a=r -p $$l/scripts/*.default ${prefix}/share/wizards/$$l/scripts; \
+		fi \
 	done
+	install --mode=a=r -p news_wizard/scripts/news.cron ${prefix}/share/wizards/news_wizard/scripts/; \
 	find ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard -type f -regex ".*.pm$$" \
 		-exec perl -i -pe "s,(\\\$$ENV{__WIZ_HOME__}|__WIZ_HOME__),$(WIZ_HOME),g" \{\} \;