From 5604a90870d3b0efc3f82f802ef8b3b66e95ce5a Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 8 Nov 2015 21:27:49 +0200 Subject: [PATCH] installer update (fail2ban) --- .gitignore | 1 + install/debian/7/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/7/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/7/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/7/packages.tar.gz | Bin 555 -> 555 bytes install/debian/7/templates.tar.gz | Bin 12114 -> 12114 bytes install/debian/8/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/8/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/8/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/8/packages.tar.gz | Bin 555 -> 555 bytes install/debian/8/templates.tar.gz | Bin 12217 -> 12217 bytes install/rhel/5/dovecot.tar.gz | Bin 474 -> 474 bytes install/rhel/5/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/5/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/5/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/5/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/6/dovecot.tar.gz | Bin 2640 -> 2640 bytes install/rhel/6/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/6/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/6/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/6/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/7/dovecot.tar.gz | Bin 2641 -> 2641 bytes install/rhel/7/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/7/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/7/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/7/templates.tar.gz | Bin 12248 -> 12248 bytes install/ubuntu/12.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.04/templates.tar.gz | Bin 11940 -> 11946 bytes .../12.04/templates/web/apache2/basedir.stpl | 2 +- .../12.04/templates/web/apache2/basedir.tpl | 2 +- .../12.04/templates/web/apache2/default.stpl | 2 +- .../12.04/templates/web/apache2/default.tpl | 2 +- .../12.04/templates/web/apache2/hosting.stpl | 2 +- .../12.04/templates/web/apache2/hosting.tpl | 2 +- .../12.04/templates/web/apache2/phpcgi.stpl | 2 +- .../12.04/templates/web/apache2/phpcgi.tpl | 2 +- .../12.04/templates/web/apache2/phpfcgid.stpl | 2 +- .../12.04/templates/web/apache2/phpfcgid.tpl | 2 +- install/ubuntu/12.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.10/templates.tar.gz | Bin 11941 -> 11948 bytes .../12.10/templates/web/apache2/basedir.stpl | 2 +- .../12.10/templates/web/apache2/basedir.tpl | 2 +- .../12.10/templates/web/apache2/default.stpl | 2 +- .../12.10/templates/web/apache2/default.tpl | 2 +- .../12.10/templates/web/apache2/hosting.stpl | 2 +- .../12.10/templates/web/apache2/hosting.tpl | 2 +- .../12.10/templates/web/apache2/phpcgi.stpl | 2 +- .../12.10/templates/web/apache2/phpcgi.tpl | 2 +- .../12.10/templates/web/apache2/phpfcgid.stpl | 2 +- .../12.10/templates/web/apache2/phpfcgid.tpl | 2 +- install/ubuntu/13.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.04/templates.tar.gz | Bin 11941 -> 11949 bytes .../13.04/templates/web/apache2/basedir.stpl | 2 +- .../13.04/templates/web/apache2/basedir.tpl | 2 +- .../13.04/templates/web/apache2/default.stpl | 2 +- .../13.04/templates/web/apache2/default.tpl | 2 +- .../13.04/templates/web/apache2/hosting.stpl | 2 +- .../13.04/templates/web/apache2/hosting.tpl | 2 +- .../13.04/templates/web/apache2/phpcgi.stpl | 2 +- .../13.04/templates/web/apache2/phpcgi.tpl | 2 +- .../13.04/templates/web/apache2/phpfcgid.stpl | 2 +- .../13.04/templates/web/apache2/phpfcgid.tpl | 2 +- install/ubuntu/13.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.10/templates.tar.gz | Bin 11944 -> 11944 bytes install/ubuntu/14.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.04/templates.tar.gz | Bin 12151 -> 12151 bytes install/ubuntu/14.10/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.10/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.10/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.10/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.10/templates.tar.gz | Bin 12152 -> 12152 bytes install/ubuntu/15.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/15.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/15.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/15.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/15.04/templates.tar.gz | Bin 12213 -> 12213 bytes install/vst-install-debian.sh | 4 ++-- install/vst-install-rhel.sh | 4 ++-- install/vst-install-ubuntu.sh | 4 ++-- 94 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 980bc5b3c..d6ed513fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.tar *.zip *.gzip +*.gz diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz index 91a55bc093d6905896b919e715ef242c36f92168..64d371a5c2d31804be20e6c6ec4ccc4a4e3c1563 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gQOIs1`($1KC8PvR delta 16 XcmbOwJxiKhzMF%A^PBBP_Q|{eC$9v! diff --git a/install/debian/7/fail2ban.tar.gz b/install/debian/7/fail2ban.tar.gz index a2bf42b72a712b2f3b62b19a855c48a79446d1db..79690627865580395155df37826a118119860e6a 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gQOIs1`)(!xC@}<% delta 16 XcmX@adWe->zMF%A^PBBP_T5YXDm(=F diff --git a/install/debian/7/firewall.tar.gz b/install/debian/7/firewall.tar.gz index a98e20010cefd94c0707d0c8958caaf9da57b678..b0f3f81c54b28176fd5cfa98df68e6deb455c8f7 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gQOIs1yATrqA@u{1 delta 16 XcmbQqGLwZ}zMF%A^PBBPb|EGJBme{a diff --git a/install/debian/7/packages.tar.gz b/install/debian/7/packages.tar.gz index c692568f12fb2569c24adac07ad20b1335db297a..5c834ca699884c11a074b1b035086cecd5a35039 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gQOIs1y9yHkBsBxa delta 16 XcmZ3@vYLfmzMF%A^PBBPb`>T7CO`x- diff --git a/install/debian/7/templates.tar.gz b/install/debian/7/templates.tar.gz index 3da0cec2c3530ff2eb90a4243b809f2bd3d41817..0dd30d9d44a14755aeec9eaf69c0ef797505eb77 100644 GIT binary patch delta 16 XcmcZzMF%gQOIs1`)(!xC@}<% delta 16 XcmX@adWe->zMF%A^PBBP_T5YXDm(=F diff --git a/install/debian/8/firewall.tar.gz b/install/debian/8/firewall.tar.gz index a98e20010cefd94c0707d0c8958caaf9da57b678..b0f3f81c54b28176fd5cfa98df68e6deb455c8f7 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gQOIs1yATrqA@u{1 delta 16 XcmbQqGLwZ}zMF%A^PBBPb|EGJBme{a diff --git a/install/debian/8/packages.tar.gz b/install/debian/8/packages.tar.gz index c692568f12fb2569c24adac07ad20b1335db297a..5c834ca699884c11a074b1b035086cecd5a35039 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gQOIs1y9yHkBsBxa delta 16 XcmZ3@vYLfmzMF%A^PBBPb`>T7CO`x- diff --git a/install/debian/8/templates.tar.gz b/install/debian/8/templates.tar.gz index 0f1c99e8797b4f58d0cd091856407e7f1e6862f9..e10686f2e32fdade54f9ee475617212d77aa067e 100644 GIT binary patch delta 16 XcmdlPzcZd)zMF%gQOIs1`zCz=F%|_> delta 16 XcmdlPzcZd)zMF%A^PBBP_D%W#Ga&`P diff --git a/install/rhel/5/dovecot.tar.gz b/install/rhel/5/dovecot.tar.gz index c17fafea87296e6e34194a4991e10a7b11b4b618..4b36a9b9cb45fa8778cf4cfbd825d96812ed6df3 100644 GIT binary patch delta 16 Xcmcb`e2bY~zMF%gPRMQ}`(;J|D&qvs delta 16 Xcmcb`e2bY~zMF%A<(utB_REX_EZ_w< diff --git a/install/rhel/5/fail2ban.tar.gz b/install/rhel/5/fail2ban.tar.gz index 42dbaba599012020d47efb4011c2ed6a7ca57cbb..833b186d64be5345fbbf8e0fb17c210b0a896c09 100644 GIT binary patch delta 16 XcmdnWx|Nk(zMF%gPRMQ}`#L57CVT{B delta 16 XcmdnWx|Nk(zMF%A<(utB_H|4ED0u|U diff --git a/install/rhel/5/firewall.tar.gz b/install/rhel/5/firewall.tar.gz index dcef27e676bd8ef209a59a7deb8ee05215923b7d..1e5578bb04cc75e946549c8abdbdeb6c4a8b5469 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gPRMQ}yATrqA>ad! delta 16 XcmbQqGLwZ}zMF%A<(utBb|EGJBi#e{ diff --git a/install/rhel/5/packages.tar.gz b/install/rhel/5/packages.tar.gz index da37c520ee899ff77144628200b094c7fe5b9f4b..956ebd36671869a07155cfc8c8c664e06c1f6a04 100644 GIT binary patch delta 16 XcmbQlGKqy5IEg}TQ diff --git a/install/rhel/6/dovecot.tar.gz b/install/rhel/6/dovecot.tar.gz index 3ce714be0cac0b1434d23f24e37f95b68c13d786..f3b19a59c3e94f4913b8191ef8ccd6fb23fde9ed 100644 GIT binary patch delta 16 Xcmca0azTV$zMF%gPRMQ}yC)X_Du@JI delta 16 Xcmca0azTV$zMF%A<(utBc26zad! delta 16 XcmbQqGLwZ}zMF%A<(utBb|EGJBi#e{ diff --git a/install/rhel/6/packages.tar.gz b/install/rhel/6/packages.tar.gz index da37c520ee899ff77144628200b094c7fe5b9f4b..956ebd36671869a07155cfc8c8c664e06c1f6a04 100644 GIT binary patch delta 16 XcmbQlGKqy5IEg}TQ diff --git a/install/rhel/7/dovecot.tar.gz b/install/rhel/7/dovecot.tar.gz index da2560979aef9cec1ddd79bc0fb1216ac89c3e48..0b73120fd689d2c5fe381a32bf56049716c0297a 100644 GIT binary patch delta 16 Xcmca8a#4g`zMF%gPRMQ}yB8M#DyRfr delta 16 Xcmca8a#4g`zMF%A<(utBb}udfETsg; diff --git a/install/rhel/7/fail2ban.tar.gz b/install/rhel/7/fail2ban.tar.gz index 42dbaba599012020d47efb4011c2ed6a7ca57cbb..833b186d64be5345fbbf8e0fb17c210b0a896c09 100644 GIT binary patch delta 16 XcmdnWx|Nk(zMF%gPRMQ}`#L57CVT{B delta 16 XcmdnWx|Nk(zMF%A<(utB_H|4ED0u|U diff --git a/install/rhel/7/firewall.tar.gz b/install/rhel/7/firewall.tar.gz index dcef27e676bd8ef209a59a7deb8ee05215923b7d..1e5578bb04cc75e946549c8abdbdeb6c4a8b5469 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gPRMQ}yATrqA>ad! delta 16 XcmbQqGLwZ}zMF%A<(utBb|EGJBi#e{ diff --git a/install/rhel/7/packages.tar.gz b/install/rhel/7/packages.tar.gz index da37c520ee899ff77144628200b094c7fe5b9f4b..956ebd36671869a07155cfc8c8c664e06c1f6a04 100644 GIT binary patch delta 16 XcmbQlGKqyv diff --git a/install/ubuntu/12.04/packages.tar.gz b/install/ubuntu/12.04/packages.tar.gz index 15e18e83612b7eb00e6bb2d9257d23a09456d69c..d5c13c4689c1411c7676186d149ba56ff2454245 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gUdV1EyBHGyB4-1e delta 16 XcmbQsGM9y2zMF%A?VIgJb}=RZBx?i( diff --git a/install/ubuntu/12.04/templates.tar.gz b/install/ubuntu/12.04/templates.tar.gz index bdeab7f5b5072258daf4b8806bb0199162d4fe39..44073e7682e489f23714b7263027e8979b46a1a1 100644 GIT binary patch delta 5962 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 diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl index 3f71e6999..96de57af7 100755 --- a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl @@ -35,7 +35,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl index 75daf0e10..07ec38c98 100755 --- a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl @@ -29,7 +29,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/default.stpl b/install/ubuntu/12.04/templates/web/apache2/default.stpl index e884a95b9..da523c138 100755 --- a/install/ubuntu/12.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/default.stpl @@ -34,7 +34,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/default.tpl b/install/ubuntu/12.04/templates/web/apache2/default.tpl index 073724ce0..b95c1ee38 100755 --- a/install/ubuntu/12.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/default.tpl @@ -28,7 +28,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl index 7a5d7787f..c1c91e22e 100755 --- a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl index ab844dc74..8f3ec012a 100755 --- a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl index aa5137308..58c4baf90 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl +++ b/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* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl index a05ff252d..21be2cdd7 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl index 622495756..20a580093 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl +++ b/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* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl index 5c1f16e20..72e7d8d44 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/dovecot.tar.gz b/install/ubuntu/12.10/dovecot.tar.gz index 40d9292b290829293805bffe50bdcb3ceb09e096..381067f701ad8e6b4cfd971db06d4d8f105dc4ca 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%gUdV1EdnPXcFFFLv delta 16 Xcmew$^+AeVzMF%A?VIgJ_Do&?F+K$~ diff --git a/install/ubuntu/12.10/fail2ban.tar.gz b/install/ubuntu/12.10/fail2ban.tar.gz index 9ea57f7707afd199623ad0ef47e2080854a7186e..9067be54eb29bff5bbb5f723b8b1847ebcf47cc1 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%gUdV1E`(7phC}RYY delta 16 XcmX@YdW4l-zMF%A?VIgJ_PtC1DrW@z diff --git a/install/ubuntu/12.10/firewall.tar.gz b/install/ubuntu/12.10/firewall.tar.gz index dce4fe075572b47ef1bf3c52042e52eb735997f1..4fb82efce206fc8eed897eefdeb774c910bccb1a 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%gUdV1EI}Z~8AtwWU delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% diff --git a/install/ubuntu/12.10/packages.tar.gz b/install/ubuntu/12.10/packages.tar.gz index d17f37f21178cb584f08ae81e1ad821be31905b2..e6c3a06712e86cc0959b243e250e8f1228e2852a 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gLC9_+yBHGyB5nhm delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> diff --git a/install/ubuntu/12.10/templates.tar.gz b/install/ubuntu/12.10/templates.tar.gz index dfd35e917fd7039d279f2f14429bf6fe81073882..171b0f4ab925f42568389f2ea7aff86af2a5bdd3 100644 GIT binary patch delta 5956 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 delta 5949 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 diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl index 3f71e6999..96de57af7 100755 --- a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl @@ -35,7 +35,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl index 75daf0e10..07ec38c98 100755 --- a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl @@ -29,7 +29,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/default.stpl b/install/ubuntu/12.10/templates/web/apache2/default.stpl index e884a95b9..da523c138 100755 --- a/install/ubuntu/12.10/templates/web/apache2/default.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/default.stpl @@ -34,7 +34,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/default.tpl b/install/ubuntu/12.10/templates/web/apache2/default.tpl index 073724ce0..b95c1ee38 100755 --- a/install/ubuntu/12.10/templates/web/apache2/default.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/default.tpl @@ -28,7 +28,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl index 7a5d7787f..c1c91e22e 100755 --- a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl index ab844dc74..8f3ec012a 100755 --- a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl index aa5137308..58c4baf90 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl +++ b/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* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl index a05ff252d..21be2cdd7 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl index 622495756..20a580093 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl +++ b/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* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl index 5c1f16e20..72e7d8d44 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/dovecot.tar.gz b/install/ubuntu/13.04/dovecot.tar.gz index da7a32e6ffbe8e2c610cad1a07baace4e61a833f..09914f981c89375a89804d3ec915695257b50133 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%gLC9_+dnPXcFF^#% delta 16 Xcmew$^+AeVzMF%A{hRGZ_Do&?F+~M7 diff --git a/install/ubuntu/13.04/fail2ban.tar.gz b/install/ubuntu/13.04/fail2ban.tar.gz index 824f879487dcc643d596abaa7f5600db53a92ec6..93832ed883c530f121170bd086a59e920a2df7fb 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%gLC9_+`(7phC~5?g delta 16 XcmX@YdW4l-zMF%A{hRGZ_PtC1DsBY* diff --git a/install/ubuntu/13.04/firewall.tar.gz b/install/ubuntu/13.04/firewall.tar.gz index dce4fe075572b47ef1bf3c52042e52eb735997f1..5f2614a9f8b6f24daa681ab5908a4d41c66856d5 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%gLC9_+I}Z~8Aua=c delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% diff --git a/install/ubuntu/13.04/packages.tar.gz b/install/ubuntu/13.04/packages.tar.gz index d17f37f21178cb584f08ae81e1ad821be31905b2..e6c3a06712e86cc0959b243e250e8f1228e2852a 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gLC9_+yBHGyB5nhm delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> diff --git a/install/ubuntu/13.04/templates.tar.gz b/install/ubuntu/13.04/templates.tar.gz index 5f61577ba30a65958bd029bab47575c540cc5370..c2ee87db62f17c1e0c0b3570da034799e21151cf 100644 GIT binary patch delta 5956 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 mB^ooZf22x6e&i7 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 diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl index 3f71e6999..96de57af7 100755 --- a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl @@ -35,7 +35,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl index 75daf0e10..07ec38c98 100755 --- a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl @@ -29,7 +29,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/default.stpl b/install/ubuntu/13.04/templates/web/apache2/default.stpl index e884a95b9..da523c138 100755 --- a/install/ubuntu/13.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/default.stpl @@ -34,7 +34,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/default.tpl b/install/ubuntu/13.04/templates/web/apache2/default.tpl index 073724ce0..b95c1ee38 100755 --- a/install/ubuntu/13.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/default.tpl @@ -28,7 +28,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl index 7a5d7787f..c1c91e22e 100755 --- a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl index ab844dc74..8f3ec012a 100755 --- a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl index aa5137308..58c4baf90 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl +++ b/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* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl index a05ff252d..21be2cdd7 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl index 622495756..20a580093 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl +++ b/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* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl index 5c1f16e20..72e7d8d44 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.10/dovecot.tar.gz b/install/ubuntu/13.10/dovecot.tar.gz index da7a32e6ffbe8e2c610cad1a07baace4e61a833f..09914f981c89375a89804d3ec915695257b50133 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%gLC9_+dnPXcFF^#% delta 16 Xcmew$^+AeVzMF%A{hRGZ_Do&?F+~M7 diff --git a/install/ubuntu/13.10/fail2ban.tar.gz b/install/ubuntu/13.10/fail2ban.tar.gz index 824f879487dcc643d596abaa7f5600db53a92ec6..93832ed883c530f121170bd086a59e920a2df7fb 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%gLC9_+`(7phC~5?g delta 16 XcmX@YdW4l-zMF%A{hRGZ_PtC1DsBY* diff --git a/install/ubuntu/13.10/firewall.tar.gz b/install/ubuntu/13.10/firewall.tar.gz index dce4fe075572b47ef1bf3c52042e52eb735997f1..5f2614a9f8b6f24daa681ab5908a4d41c66856d5 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%gLC9_+I}Z~8Aua=c delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% diff --git a/install/ubuntu/13.10/packages.tar.gz b/install/ubuntu/13.10/packages.tar.gz index d17f37f21178cb584f08ae81e1ad821be31905b2..e6c3a06712e86cc0959b243e250e8f1228e2852a 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gLC9_+yBHGyB5nhm delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> diff --git a/install/ubuntu/13.10/templates.tar.gz b/install/ubuntu/13.10/templates.tar.gz index 82f493f2fe53d0a8d549a557cc9365e6ed02fe87..9d61eafe072546abdbb09a73e75953aef918e5e6 100644 GIT binary patch delta 16 XcmZ1xyCRldzMF%gLC9_+`$9bcF17_5 delta 16 XcmZ1xyCRldzMF%A{hRGZ_Jw)?FuDbW diff --git a/install/ubuntu/14.04/dovecot.tar.gz b/install/ubuntu/14.04/dovecot.tar.gz index e6a75fceda26c8f45e00a5ab11041623f695d642..83d540fcd31eec5049a880aaaac73743dc4c899e 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk diff --git a/install/ubuntu/14.04/fail2ban.tar.gz b/install/ubuntu/14.04/fail2ban.tar.gz index 5d0c7c98012fdaa952af08dae7eaaac77bd792ee..9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ diff --git a/install/ubuntu/14.04/firewall.tar.gz b/install/ubuntu/14.04/firewall.tar.gz index 3eeeb373dc936d2d7fa14b2985c059ea34546739..5011ce37d6e58eb300fadcf871dc67b9068bd48f 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K diff --git a/install/ubuntu/14.04/packages.tar.gz b/install/ubuntu/14.04/packages.tar.gz index 8bdafde82b251fc4c69ef1605b54cd6d2292f422..4838e33cc5fc7322e3830568c34b74be03a1d7e0 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt diff --git a/install/ubuntu/14.04/templates.tar.gz b/install/ubuntu/14.04/templates.tar.gz index 1308e254cb66e9398235493a98c90cdb0295cf64..e405fd768018ab123fbe19583a0206d3b9572009 100644 GIT binary patch delta 16 Xcmew!_dSkXzMF%gLC9_+dx1UxH?swc delta 16 Xcmew!_dSkXzMF%A{hRGZ_5ytXIkyG% diff --git a/install/ubuntu/14.10/dovecot.tar.gz b/install/ubuntu/14.10/dovecot.tar.gz index e6a75fceda26c8f45e00a5ab11041623f695d642..83d540fcd31eec5049a880aaaac73743dc4c899e 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk diff --git a/install/ubuntu/14.10/fail2ban.tar.gz b/install/ubuntu/14.10/fail2ban.tar.gz index 5d0c7c98012fdaa952af08dae7eaaac77bd792ee..9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ diff --git a/install/ubuntu/14.10/firewall.tar.gz b/install/ubuntu/14.10/firewall.tar.gz index 3eeeb373dc936d2d7fa14b2985c059ea34546739..5011ce37d6e58eb300fadcf871dc67b9068bd48f 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K diff --git a/install/ubuntu/14.10/packages.tar.gz b/install/ubuntu/14.10/packages.tar.gz index 8bdafde82b251fc4c69ef1605b54cd6d2292f422..4838e33cc5fc7322e3830568c34b74be03a1d7e0 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt diff --git a/install/ubuntu/14.10/templates.tar.gz b/install/ubuntu/14.10/templates.tar.gz index 9fd8fccbc9359cd53f8c04e9296f12fb21283bee..f5b9cb13bc30c66e047ee78bb811cff71398b361 100644 GIT binary patch delta 16 Xcmewn_aly7zMF%gLC9_+d!ar6H`4`< delta 16 Xcmewn_aly7zMF%A{hRGZ_CkFCIoAdF diff --git a/install/ubuntu/15.04/dovecot.tar.gz b/install/ubuntu/15.04/dovecot.tar.gz index e6a75fceda26c8f45e00a5ab11041623f695d642..83d540fcd31eec5049a880aaaac73743dc4c899e 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk diff --git a/install/ubuntu/15.04/fail2ban.tar.gz b/install/ubuntu/15.04/fail2ban.tar.gz index 5d0c7c98012fdaa952af08dae7eaaac77bd792ee..9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ diff --git a/install/ubuntu/15.04/firewall.tar.gz b/install/ubuntu/15.04/firewall.tar.gz index 3eeeb373dc936d2d7fa14b2985c059ea34546739..5011ce37d6e58eb300fadcf871dc67b9068bd48f 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K diff --git a/install/ubuntu/15.04/packages.tar.gz b/install/ubuntu/15.04/packages.tar.gz index 8bdafde82b251fc4c69ef1605b54cd6d2292f422..4838e33cc5fc7322e3830568c34b74be03a1d7e0 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt diff --git a/install/ubuntu/15.04/templates.tar.gz b/install/ubuntu/15.04/templates.tar.gz index 0a457066c425828c4fc2aba34790a1788484f214..d96e3cf2b8fe06f69607cd9dd69dcac9cde9d26c 100644 GIT binary patch delta 16 XcmdlQzcrp+zMF%gLC9_+`#OC9FpmXC delta 16 XcmdlQzcrp+zMF%A{hRGZ_I3IIGLr?d diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index f867a654a..7dc3a3b7c 100755 --- a/install/vst-install-debian.sh +++ b/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 diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 058af598d..818baf56c 100755 --- a/install/vst-install-rhel.sh +++ b/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 diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 64306f8a5..194196d66 100755 --- a/install/vst-install-ubuntu.sh +++ b/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