Adjust default web template and only use itk on single php deb10 install

ScIT-Raphael · ScIT-Raphael · commit 86e88e6c027f · 2020-01-13T08:14:53.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,8 @@ All notable changes to this project will be documented in this file.
 - Added official postgresql repository to be up to date.
 - Hardening MySQL configuration, prevent local infile.
 - Fixed lograte bug and cleans up the messed up nginx/apache2 log permissions.
+- Fixed IfModule mpm_itk.c for apache2 templates.
+- Added mpm_itk for Deb10 single php installation only.
 
 ## [1.0.6] - 2019-09-24 - Hotfix
 ### Bugfixes
diff --git a/install/deb/multiphp/apache2/PHP-56.stpl b/install/deb/multiphp/apache2/PHP-56.stpl
@@ -24,14 +24,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-56.tpl b/install/deb/multiphp/apache2/PHP-56.tpl
@@ -21,14 +21,6 @@
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-70.stpl b/install/deb/multiphp/apache2/PHP-70.stpl
@@ -24,14 +24,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-70.tpl b/install/deb/multiphp/apache2/PHP-70.tpl
@@ -21,14 +21,6 @@
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-71.stpl b/install/deb/multiphp/apache2/PHP-71.stpl
@@ -24,14 +24,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-71.tpl b/install/deb/multiphp/apache2/PHP-71.tpl
@@ -21,14 +21,6 @@
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-72.stpl b/install/deb/multiphp/apache2/PHP-72.stpl
@@ -24,14 +24,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-72.tpl b/install/deb/multiphp/apache2/PHP-72.tpl
@@ -21,14 +21,6 @@
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-73.stpl b/install/deb/multiphp/apache2/PHP-73.stpl
@@ -24,14 +24,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-73.tpl b/install/deb/multiphp/apache2/PHP-73.tpl
@@ -21,14 +21,6 @@
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-74.stpl b/install/deb/multiphp/apache2/PHP-74.stpl
@@ -24,14 +24,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/multiphp/apache2/PHP-74.tpl b/install/deb/multiphp/apache2/PHP-74.tpl
@@ -21,14 +21,6 @@
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/"
diff --git a/install/deb/templates/web/apache2/default.stpl b/install/deb/templates/web/apache2/default.stpl
@@ -33,7 +33,7 @@
         RUidGid %user% %group%
         RGroups www-data
     </IfModule>
-    <IfModule itk.c>
+    <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
diff --git a/install/deb/templates/web/apache2/default.tpl b/install/deb/templates/web/apache2/default.tpl
@@ -30,7 +30,7 @@
         RUidGid %user% %group%
         RGroups www-data
     </IfModule>
-    <IfModule itk.c>
+    <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
diff --git a/install/deb/templates/web/apache2/hosting.stpl b/install/deb/templates/web/apache2/hosting.stpl
@@ -39,7 +39,7 @@
         RUidGid %user% %group%
         RGroups www-data
     </IfModule>
-    <IfModule itk.c>
+    <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
diff --git a/install/deb/templates/web/apache2/hosting.tpl b/install/deb/templates/web/apache2/hosting.tpl
@@ -36,7 +36,7 @@
         RUidGid %user% %group%
         RGroups www-data
     </IfModule>
-    <IfModule itk.c>
+    <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
diff --git a/install/deb/templates/web/apache2/php-fpm/default.stpl b/install/deb/templates/web/apache2/php-fpm/default.stpl
@@ -24,14 +24,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:%backend_lsnr%|fcgi://localhost/"
diff --git a/install/deb/templates/web/apache2/php-fpm/default.tpl b/install/deb/templates/web/apache2/php-fpm/default.tpl
@@ -21,14 +21,6 @@
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>
-#    <IfModule mod_ruid2.c>
-#        RMode config
-#        RUidGid %user% %group%
-#        RGroups www-data
-#    </IfModule>
-#    <IfModule itk.c>
-#        AssignUserID %user% %group%
-#    </IfModule>
 
     <FilesMatch \.php$>
         SetHandler "proxy:%backend_lsnr%|fcgi://localhost/"
diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -43,9 +43,9 @@ elif [ "$release" -eq 9 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom
         libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php$fpm_v 
         php$fpm_v php$fpm_v-common php$fpm_v-cgi php$fpm_v-mysql php$fpm_v-curl
-        php$fpm_v-pgsql php$fpm_v-imagick php$fpm_v-imap php$fpm_v-ldap php$fpm_v-apcu awstats
-        php$fpm_v-zip php$fpm_v-bz2 php$fpm_v-cli php$fpm_v-gd
-        php$fpm_v-intl php$fpm_v-json php$fpm_v-mbstring
+        php$fpm_v-pgsql php$fpm_v-imagick php$fpm_v-imap php$fpm_v-ldap
+        php$fpm_v-apcu awstats php$fpm_v-zip php$fpm_v-bz2 php$fpm_v-cli
+        php$fpm_v-gd php$fpm_v-intl php$fpm_v-json php$fpm_v-mbstring
         php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline php$fpm_v-xml
         vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
         spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
@@ -761,6 +761,7 @@ if [ "$apache" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
     software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
     software=$(echo "$software" | sed -e "s/libapache2-mod-php$fpm_v//")
+    software=$(echo "$software" | sed -e "s/libapache2-mpm-itk//")
 fi
 if [ "$vsftpd" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/vsftpd//")
@@ -814,6 +815,7 @@ if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
 fi
 if [ "$phpfpm" = 'yes' ]; then
     software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
+    software=$(echo "$software" | sed -e "s/libapache2-mpm-itk//")
 fi
 if [ -d "$withdebs" ]; then
     software=$(echo "$software" | sed -e "s/hestia-nginx//")
