Browse Source

Use absolute path

Ernesto Nicolás Carrea 5 years ago
parent
commit
dbf8e06d01

+ 1 - 1
bin/module/clamav/install.inc

@@ -57,6 +57,6 @@ hestia_module_clamav_install() {
 
 
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     if [ "$exim_installed" ]; then
     if [ "$exim_installed" ]; then
-        hestia module clamav exim-integration enable
+        $BIN/hestia module clamav exim-integration enable
     fi
     fi
 }
 }

+ 1 - 1
bin/module/clamav/remove.inc

@@ -19,7 +19,7 @@ hestia_module_clamav_remove() {
 
 
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     if [ "$exim_installed" ]; then
     if [ "$exim_installed" ]; then
-        hestia module clamav exim-integration disable
+        $BIN/hestia module clamav exim-integration disable
     fi
     fi
 
 
     osal_service_stop $OSAL_SERVICE_CLAMAV > /dev/null 2>&1
     osal_service_stop $OSAL_SERVICE_CLAMAV > /dev/null 2>&1

+ 8 - 2
bin/module/exim/install.inc

@@ -56,11 +56,17 @@ hestia_module_exim_install() {
 
 
     clamav_installed=$(hestia_module_variant_installed 'antivirus' 'clamav')
     clamav_installed=$(hestia_module_variant_installed 'antivirus' 'clamav')
     if [ "$clamav_installed" ]; then
     if [ "$clamav_installed" ]; then
-        hestia module clamav exim-integration enable
+        $BIN/hestia module clamav exim-integration enable
     fi
     fi
 
 
     spamassassin_installed=$(hestia_module_variant_installed 'antispam' 'spamassassin')
     spamassassin_installed=$(hestia_module_variant_installed 'antispam' 'spamassassin')
     if [ "$spamassassin_installed" ]; then
     if [ "$spamassassin_installed" ]; then
-        hestia module spamassassin exim-integration enable
+        $BIN/hestia module spamassassin exim-integration enable
     fi
     fi
+
+    # Rebuild mail
+    for user in $($HESTIA/bin/v-list-sys-users plain); do
+        echo "Rebuilding mail domains for user $user"
+        $BIN/v-rebuild-mail-domains $user 'no' >/dev/null 2>&1
+    done
 }
 }

+ 2 - 2
bin/module/exim/remove.inc

@@ -26,12 +26,12 @@ hestia_module_exim_remove() {
 
 
     clamav_installed=$(hestia_module_variant_installed 'antivirus' 'clamav')
     clamav_installed=$(hestia_module_variant_installed 'antivirus' 'clamav')
     if [ "$clamav_installed" ]; then
     if [ "$clamav_installed" ]; then
-        hestia module clamav exim-integration disable
+        $BIN/hestia module clamav exim-integration disable
     fi
     fi
 
 
     spamassassin_installed=$(hestia_module_variant_installed 'antispam' 'spamassassin')
     spamassassin_installed=$(hestia_module_variant_installed 'antispam' 'spamassassin')
     if [ "$spamassassin_installed" ]; then
     if [ "$spamassassin_installed" ]; then
-        hestia module spamassassin exim-integration disable
+        $BIN/hestia module spamassassin exim-integration disable
     fi
     fi
 
 
     osal_kv_write $HESTIA/conf/hestia.conf 'MAIL_SYSTEM' 'no'
     osal_kv_write $HESTIA/conf/hestia.conf 'MAIL_SYSTEM' 'no'

+ 1 - 1
bin/module/nginx/install.inc

@@ -67,5 +67,5 @@ hestia_module_nginx_install() {
     osal_kv_write $HESTIA_CONF_MODULES/nginx.conf 'service_name' $OSAL_PKG_NGINX
     osal_kv_write $HESTIA_CONF_MODULES/nginx.conf 'service_name' $OSAL_PKG_NGINX
 
 
     # Setup web module (depending on Nginx and/or Apache config)
     # Setup web module (depending on Nginx and/or Apache config)
-    hestia module web setup
+    $BIN/hestia module web setup
 }
 }

+ 1 - 1
bin/module/nginx/remove.inc

@@ -25,5 +25,5 @@ hestia_module_nginx_remove() {
     osal_kv_write $HESTIA_CONF_MODULES/nginx.conf 'version' '0'
     osal_kv_write $HESTIA_CONF_MODULES/nginx.conf 'version' '0'
 
 
     # Setup web module (depending on Nginx and/or Apache config)
     # Setup web module (depending on Nginx and/or Apache config)
-    hestia module web setup
+    $BIN/hestia module web setup
 }
 }

+ 1 - 1
bin/module/php/install.inc

@@ -22,7 +22,7 @@ hestia_module_php_install() {
 
 
     # Add default version
     # Add default version
     echo "Adding default PHP version..."
     echo "Adding default PHP version..."
-    hestia module php add --ver $PHP_DEFAULT_VERSION
+    $BIN/hestia module php add --ver $PHP_DEFAULT_VERSION
 
 
     exit 0
     exit 0
 }
 }

+ 1 - 1
bin/module/spamassassin/install.inc

@@ -39,6 +39,6 @@ hestia_module_spamassassin_install() {
 
 
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     if [ "$exim_installed" ]; then
     if [ "$exim_installed" ]; then
-        hestia module spamassassin exim-integration enable
+        $BIN/hestia module spamassassin exim-integration enable
     fi
     fi
 }
 }

+ 1 - 1
bin/module/spamassassin/remove.inc

@@ -19,7 +19,7 @@ hestia_module_spamassassin_remove() {
 
 
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     exim_installed=$(hestia_module_variant_installed 'mta' 'exim')
     if [ "$exim_installed" ]; then
     if [ "$exim_installed" ]; then
-        hestia module spamassassin exim-integration disable
+        $BIN/hestia module spamassassin exim-integration disable
     fi
     fi
 
 
     osal_service_stop $OSAL_SERVICE_SPAMASSASSIN > /dev/null 2>&1
     osal_service_stop $OSAL_SERVICE_SPAMASSASSIN > /dev/null 2>&1