Просмотр исходного кода

Remove ruid2 support for CentOS

Ernesto Nicolás Carrea 5 лет назад
Родитель
Сommit
2dc2afce7b

+ 0 - 2
bin/module/apache/install.inc

@@ -15,8 +15,6 @@ hestia_module_apache_install() {
 
     osal_package_preinstall
     osal_package_install $OSAL_PKG_APACHE $OSAL_PKG_APACHE_EXTRA
-    # Install ruid2 separately, in case it fails (i.e. not available)
-    osal_package_install $OSAL_PKG_APACHE_MOD_RUID2
 
     mkdir -p $OSAL_PATH_APACHE_CONF_D/domains
 

+ 0 - 3
bin/module/php/integrate.inc

@@ -12,9 +12,6 @@ hestia_module_php_integrate() {
             osal_apache_module_disable mpm_prefork > /dev/null 2>&1
             osal_apache_module_enable mpm_event > /dev/null 2>&1
             cp -f $HESTIA_INSTALL_DIR/$WEB_SYSTEM/hestia-event.conf $OSAL_PATH_APACHE_CONF_D/
-        elif [ "$php_variant" = 'ruid2' ]; then
-            # FIXME: enable only if needed
-            osal_apache_module_enable ruid2 > /dev/null 2>&1
         fi
     fi
 }

+ 0 - 1
docs-cli.md

@@ -21,7 +21,6 @@ nginx-proxy      rproxy       No   Nginx reverse proxy
 nginx-web        web          No   Nginx web server
 php-fpm          php          Yes  PHP language FPM
 phpmyadmin       phpmyadmin   Yes  phpMyAdmin MariaDB/MySQL web admin
-php-ruid2        php          No   PHP language ruid2
 spamassassin     antispam     Yes  SpamAssassin antispam
 vsftpd           ftp          No   Vsftpd FTP server
 ```

+ 0 - 5
install/rhel/templates/web/httpd/default.stpl

@@ -42,11 +42,6 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    <IfModule mod_ruid2.c>
-        RMode config
-        RUidGid %user% %group%
-        RGroups %apache_group%
-    </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>

+ 0 - 5
install/rhel/templates/web/httpd/default.tpl

@@ -39,11 +39,6 @@
         AllowOverride All
     </Directory>
 
-    <IfModule mod_ruid2.c>
-        RMode config
-        RUidGid %user% %group%
-        RGroups %apache_group%
-    </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>

+ 0 - 5
install/rhel/templates/web/httpd/hosting.stpl

@@ -48,11 +48,6 @@
     SSLCertificateFile %ssl_crt%
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-    <IfModule mod_ruid2.c>
-        RMode config
-        RUidGid %user% %group%
-        RGroups %apache_group%
-    </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>

+ 0 - 5
install/rhel/templates/web/httpd/hosting.tpl

@@ -44,11 +44,6 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    <IfModule mod_ruid2.c>
-        RMode config
-        RUidGid %user% %group%
-        RGroups %apache_group%
-    </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%
     </IfModule>