Merge branch 'master' into webui_anvil_page

anvil.spec.in

@@ -72,6 +72,7 @@ Requires:       perl-DBI
 Requires:       perl-Data-Validate-Domain
 Requires:       perl-Digest-SHA
 Requires:       perl-File-MimeInfo
+Requires:       perl-CGI
 Requires:       perl-HTML-FromText
 Requires:       perl-HTML-Strip
 Requires:       perl-IO-Tty
@@ -129,7 +130,6 @@ Requires:       gdm
 Requires:       gnome-terminal
 Requires:       httpd
 Requires:       nmap
-Requires:       perl-CGI 
 Requires:       postgresql-server 
 Requires:       syslinux
 Requires:       syslinux-nonlinux
@@ -358,8 +358,8 @@ fi
 %config(noreplace) %{_sysconfdir}/anvil/anvil.conf
 %{_usr}/lib/*
 %config(noreplace) %{_datadir}/anvil/anvil.sql
-%{_usr}/share/anvil/firewall.txt
-%{_usr}/share/anvil/words.xml
+%{_datadir}/anvil/firewall.txt
+%{_datadir}/anvil/words.xml
 %{_sbindir}/*
 %{_sysconfdir}/anvil/anvil.version
 %{_datadir}/perl5/*
@@ -367,6 +367,7 @@ fi
 
 %files striker
 %{_localstatedir}/www/*/*
+%{_datadir}/anvil/striker-auto-initialize-all.example
 %ghost %{_sysconfdir}/anvil/snmp-vendors.txt
 
 %files node

tools/Makefile.am

@@ -36,10 +36,15 @@ dist_sbin_SCRIPTS	= \
 			  striker-parse-oui \
 			  striker-prep-database \
 			  striker-purge-host \
-			  striker-scan-network
+			  striker-scan-network \
+			  striker-auto-initialize-all
 
 fencedir		= $(FASEXECPREFIX)/sbin
 
 dist_fence_SCRIPTS	= \
 			  fence_delay \
 			  fence_pacemaker
+
+sharedir		= ${datarootdir}/anvil
+
+dist_share_DATA		= striker-auto-initialize-all.example