installer update (fail2ban)

.gitignore

@@ -1,3 +1,4 @@
 *.tar
 *.zip
 *.gzip
+*.gz

install/ubuntu/12.04/templates/web/apache2/basedir.stpl

@@ -35,7 +35,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/basedir.tpl

@@ -29,7 +29,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/default.stpl

@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/default.tpl

@@ -28,7 +28,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/hosting.stpl

@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/hosting.tpl

@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl

@@ -29,7 +29,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl

@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl

@@ -30,7 +30,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl

@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/basedir.stpl

@@ -35,7 +35,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/basedir.tpl

@@ -29,7 +29,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/default.stpl

@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/default.tpl

@@ -28,7 +28,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/hosting.stpl

@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/hosting.tpl

@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl

@@ -29,7 +29,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl

@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl

@@ -30,7 +30,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl

@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/basedir.stpl

@@ -35,7 +35,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/basedir.tpl

@@ -29,7 +29,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/default.stpl

@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/default.tpl

@@ -28,7 +28,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/hosting.stpl

@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/hosting.tpl

@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl

@@ -29,7 +29,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl

@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl

@@ -30,7 +30,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl

@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/vst-install-debian.sh

@@ -1074,12 +1074,12 @@ if [ "$fail2ban" = 'yes' ]; then
     rm -f fail2ban.tar.gz
     if [ "$dovecot" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     if [ "$exim" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     update-rc.d fail2ban defaults

install/vst-install-rhel.sh

@@ -1143,12 +1143,12 @@ if [ "$fail2ban" = 'yes' ]; then
     rm -f fail2ban.tar.gz
     if [ "$dovecot" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     if [ "$exim" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     chkconfig fail2ban on

install/vst-install-ubuntu.sh

@@ -1063,12 +1063,12 @@ if [ "$fail2ban" = 'yes' ]; then
     rm -f fail2ban.tar.gz
     if [ "$dovecot" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     if [ "$exim" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     update-rc.d fail2ban defaults