Explicitly enable apache2 on boot and disable IPV6 for NFS

diff --git a/templates/setup-head.sh b/templates/setup-head.sh
index d2e9884..9cf62c5 100755 (executable)
--- a/templates/setup-head.sh
+++ b/templates/setup-head.sh
@@ -134,6 +134,11 @@ fi
 
 ### fix NFS start bug in systemd
 systemctl add-wants nfs-mountd.service rpcbind.service
+if [ -e "/etc/netconfig" ] #Disable IPV6/ipv6
+then
+       sed -i 's/^tcp6/#tcp6/g' /etc/netconfig
+       sed -i 's/^udp6/#udp6/g' /etc/netconfig
+fi
 
 ### Fix ejabberd/apparmor bug - commented out because it's not working
 #FixAppArmorEJabberD
@@ -449,6 +454,7 @@ SetupMonitoring
 
 ### Enable systemd autogen service for first boot
 systemctl enable autogen
+systemctl enable apache2
 
 echo
 echo

diff --git a/templates/setup.sh b/templates/setup.sh
index e9d1d75..2255fab 100755 (executable)
--- a/templates/setup.sh
+++ b/templates/setup.sh
@@ -221,6 +221,11 @@ if cat tar_file_apt.list | grep -q nfs
 then
        systemctl add-wants nfs-mountd.service rpcbind.service
 fi
+if [ -e "/etc/netconfig" ] #Disable IPV6/ipv6
+then
+        sed -i 's/^tcp6/#tcp6/g' /etc/netconfig
+        sed -i 's/^udp6/#udp6/g' /etc/netconfig
+fi
 
 ### Fix ejabberd/apparmor bug - commented out because it didn't work
 #FixAppArmorEJabberD