Prefix

bin/v-add-web-php

@@ -24,7 +24,7 @@ source $HESTIA/conf/hestia.conf
 
 check_args '1' "$#" 'VERSION'
 
-php_prefix=$(multiphp_php_package_prefix $version)
+php_prefix=$(osal_multiphp_php_package_prefix $version)
 
 # Verify php version format
 if [[ ! $version =~ ^[0-9]\.[0-9]+ ]]; then
@@ -33,7 +33,7 @@ if [[ ! $version =~ ^[0-9]\.[0-9]+ ]]; then
 fi
 
 # Check if php version already exists
-if [ $(multiphp_fpm_isinstalled $version) ] && [ -f "$HESTIA/data/templates/web/php-fpm/PHP-${version/\./_}.tpl" ]; then
+if [ $(osal_multiphp_fpm_isinstalled $version) ] && [ -f "$HESTIA/data/templates/web/php-fpm/PHP-${version/\./_}.tpl" ]; then
     echo "Version already installed..."
     exit
 fi
@@ -72,29 +72,29 @@ if ! echo "$DB_SYSTEM" | grep -w 'pgsql' >/dev/null; then
 fi
 
 # Install php packages
-package_preinstall
-execute_with_spinner package_install $mph
+osal_package_preinstall
+osal_execute_with_spinner osal_package_install $mph
 
 # Check if installation was sucessfully
-if [ ! $(multiphp_fpm_isinstalled $version) ]; then
+if [ ! $(osal_multiphp_fpm_isinstalled $version) ]; then
     echo "Installation failed, please run the following command manualy for debuging:"
-    echo "$CMD_PACKAGE_MANAGER install ${mph//\\n/ \\}"
+    echo "$OSAL_CMD_PACKAGE_MANAGER install ${mph//\\n/ \\}"
 fi
 
 # Check if required modules for apache2 are enabled
 if [ "$WEB_SYSTEM" = "apache2" ] || [ "$WEB_SYSTEM" = "httpd" ]; then
-    if [ ! $(apache_module_isenabled 'proxy_fcgi') ]; then
-        apache_module_enable 'proxy_fcgi'
+    if [ ! $(osal_apache_module_isenabled 'proxy_fcgi') ]; then
+        osal_apache_module_enable 'proxy_fcgi'
     fi
-    if [ ! $(apache_module_isenabled 'setenvif') ]; then
-        apache_module_enable 'setenvif'
+    if [ ! $(osal_apache_module_isenabled 'setenvif') ]; then
+        osal_apache_module_enable 'setenvif'
     fi
     $BIN/v-restart-web
 fi
 
 # Configure fpm
-service_enable $php_prefix-fpm > /dev/null 2>&1
-pool_d=$(multiphp_fpm_pool_d $version)
+osal_service_enable $php_prefix-fpm > /dev/null 2>&1
+pool_d=$(osal_multiphp_fpm_pool_d $version)
 if [ $pool_d ]; then
     v_tpl=${version//.}
     rm -f $pool_d/*

bin/v-delete-web-php

@@ -24,7 +24,7 @@ source $HESTIA/conf/hestia.conf
 
 check_args '1' "$#" 'VERSION'
 
-php_prefix=$(multiphp_php_package_prefix $version)
+php_prefix=$(osal_multiphp_php_package_prefix $version)
 
 # Verify php version format
 if [[ ! $version =~ ^[0-9]\.[0-9]+ ]]; then
@@ -36,7 +36,7 @@ fi
 [ -f $HESTIA/data/templates/web/php-fpm/PHP-${version/\./_}.tpl ] && rm -f $HESTIA/data/templates/web/php-fpm/PHP-${version/\./_}.tpl
 
 # Check if php version exists
-if [ ! $(multiphp_fpm_isinstalled $version) ] && [ ! -f "$HESTIA/data/templates/$WEB_SYSTEM/PHP-$version.sh" ]; then
+if [ ! $(osal_multiphp_fpm_isinstalled $version) ] && [ ! -f "$HESTIA/data/templates/$WEB_SYSTEM/PHP-$version.sh" ]; then
     echo "Version is not installed..."
     exit
 fi
@@ -60,16 +60,16 @@ if [[ `echo "$version 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
 fi
 
 # Purge php packages
-execute_with_spinner package_remove $mph
+osal_execute_with_spinner osal_package_remove $mph
 
 # Check if uninstallation was sucessfully
 if [ $(multiphp_fpm_isinstalled $version) ]; then
     echo "Uninstallation failed, please run the following command manualy for debuging:"
-    echo "$CMD_PACKAGE_MANAGER (remove or purge) ${mph//\\n/ \\}"
+    echo "$OSAL_CMD_PACKAGE_MANAGER (remove or purge) ${mph//\\n/ \\}"
 fi
 
 # Cleanup php folder
-etc_folder=$(multiphp_etc_folder $version)
+etc_folder=$(osal_multiphp_etc_folder $version)
 [[ -d "$etc_folder" ]] && rm -rf "$etc_folder"
 
 

func/osal.sh

@@ -35,16 +35,16 @@ do
 done
 
 # VAR = $(ini_get 'file' 'section' 'param' 'newvalue')
-ini_get() {
+osal_ini_get() {
     /usr/bin/crudini --get "$@"
 }
 
 # ini_set 'file' 'section' 'param' 'newvalue'
-ini_set() {
+osal_ini_set() {
     /usr/bin/crudini --set "$@"
 }
 
-execute_with_spinner() {
+osal_execute_with_spinner() {
     if [ "$OSAL_DEBUG" ]; then
         echo "$@"
         $@

func/osal_centos_7.sh

@@ -2,4 +2,4 @@
 # CentOS 7 specific
 
 # Commands
-CMD_PACKAGE_MANAGER=/usr/bin/yum
+OSAL_CMD_PACKAGE_MANAGER=/usr/bin/yum

func/osal_debian_based.sh

@@ -6,30 +6,31 @@
 #-------------------------------------------------------------------#
 
 # Services
-SERVICE_NAME_APACHE=apache2
-SERVICE_NAME_BIND=bind9
-SERVICE_NAME_CRON=cron
+OSAL_SERVICE_APACHE=apache2
+OSAL_SERVICE_BIND=bind9
+OSAL_SERVICE_CRON=cron
 
 # Users
-USER_APACHE_DATA=www-data
-USER_BIND=bind
-USER_NOBODY=nobody
-USER_NOGROUP=nogroup
+OSAL_USER_APACHE_DATA=www-data
+OSAL_USER_BIND=bind
+OSAL_USER_NOBODY=nobody
+OSAL_USER_NOGROUP=nogroup
 
 # Commands
-CMD_PACKAGE_MANAGER=/usr/bin/apt-get
+OSAL_CMD_PACKAGE_MANAGER=/usr/bin/apt-get
 
 # Packages
-PKG_APACHE=apache2
-PKG_APACHE_MOD_RUID2=libapache2-mod-ruid2
-PKG_BIND=bind9
-PKG_EXIM=exim4
-PKG_PHPMYADMIN=phpmyadmin
-PKG_ROUNDCUBE=roundcube
+OSAL_PKG_APACHE=apache2
+OSAL_PKG_APACHE_MOD_RUID2=libapache2-mod-ruid2
+OSAL_PKG_BIND=bind9
+OSAL_PKG_EXIM=exim4
+OSAL_PKG_PHPMYADMIN=phpmyadmin
+OSAL_PKG_ROUNDCUBE=roundcube
 
 # Paths
-PATH_BIND_DATA=/var/cache/bind
-PATH_ROUNDCUBE_INSTALL_MYSQL=/usr/share/dbconfig-common/data/roundcubemail/install/mysql
+OSAL_PATH_APACHE_CONF=/etc/apache2
+OSAL_PATH_BIND_DATA=/var/cache/bind
+OSAL_PATH_ROUNDCUBE_INSTALL_MYSQL=/usr/share/dbconfig-common/data/roundcubemail/install/mysql
 
 #-------------------------------------------------------------------#
 # Functions                                                         #
@@ -38,69 +39,69 @@ PATH_ROUNDCUBE_INSTALL_MYSQL=/usr/share/dbconfig-common/data/roundcubemail/insta
 # OS function wrappers
 
 # package_preinstall
-package_preinstall() {
-    $CMD_PACKAGE_MANAGER -qq update
+osal_package_preinstall() {
+    $OSAL_CMD_PACKAGE_MANAGER -qq update
 }
 
 # package_install 'package' 'package' ...
-package_install() {
-    $CMD_PACKAGE_MANAGER -y -qq install -o Dpkg::Options::="--force-confold" "$@"
+osal_package_install() {
+    $OSAL_CMD_PACKAGE_MANAGER -y -qq install -o Dpkg::Options::="--force-confold" "$@"
 }
 
 # package_remoev 'package' 'package' ...
-package_remove() {
-    $CMD_PACKAGE_MANAGER -y purge "$@"
+osal_package_remove() {
+    $OSAL_CMD_PACKAGE_MANAGER -y purge "$@"
 }
 
 # service_start 'service-name'
-service_start() {
+osal_service_start() {
     /usr/bin/systemctl start ${1}.service
 }
 
 # service_stop 'service-name'
-service_stop() {
+osal_service_stop() {
     /usr/bin/systemctl stop ${1}.service
 }
 
 # service_restart 'service-name'
-service_restart() {
+osal_service_restart() {
     /usr/bin/systemctl restart ${1}.service
 }
 
 # service_enable 'service-name'
-service_enable() {
+osal_service_enable() {
     /usr/bin/systemctl enable ${1}.service
 }
 
 # service_disable 'service-name'
-service_disable() {
+osal_service_disable() {
     /usr/bin/systemctl disable ${1}.service
 }
 
 # Software-specific
 
 # apache_module_isenabled 'module_name' = (1|null)
-apache_module_isenabled() {
+osal_apache_module_isenabled() {
     /usr/sbin/a2query -q -m $1 && echo 1
 }
 
 # apache_module_enable 'module_name'
-apache_module_enable() {
+osal_apache_module_enable() {
     /usr/sbin/a2enmod $1
 }
 
 # apache_module_disable 'module_name'
-apache_module_disable() {
+osal_apache_module_disable() {
     /usr/sbin/a2dismod $1
 }
 
 # multiphp_php_package_prefix 7.3 = 'php7.3'
-multiphp_php_package_prefix() {
+osal_multiphp_php_package_prefix() {
     echo "php${1}"
 }
 
 # multiphp_fpm_isinstalled 7.3 = (1|null)
-multiphp_fpm_isinstalled() {
+osal_multiphp_fpm_isinstalled() {
     [ -f "/etc/init.d/php$1-fpm" ] && echo 1
 }
 
@@ -110,6 +111,6 @@ multiphp_etc_folder() {
 }
 
 # multiphp_fpm_pool_d '7.3' = /etc/php/7.3/fpm/pool.d
-multiphp_fpm_pool_d() {
+osal_multiphp_fpm_pool_d() {
     echo /etc/php/$1/fpm/pool.d
 }

func/osal_rhel_based.sh

@@ -6,30 +6,31 @@
 #-------------------------------------------------------------------#
 
 # Services
-SERVICE_NAME_APACHE=httpd
-SERVICE_NAME_BIND=named
-SERVICE_NAME_CRON=crond
+OSAL_SERVICE_APACHE=httpd
+OSAL_SERVICE_BIND=named
+OSAL_SERVICE_CRON=crond
 
 # Users
-USER_APACHE_DATA=apache
-USER_BIND=named
-USER_NOBODY=nobody
-USER_NOGROUP=nobody
+OSAL_USER_APACHE_DATA=apache
+OSAL_USER_BIND=named
+OSAL_USER_NOBODY=nobody
+OSAL_USER_NOGROUP=nobody
 
 # Commands
-CMD_PACKAGE_MANAGER=/usr/bin/dnf
+OSAL_CMD_PACKAGE_MANAGER=/usr/bin/dnf
 
 # Packages
-PKG_APACHE=httpd
-PKG_APACHE_MOD_RUID2=mod_ruid2
-PKG_BIND=bind
-PKG_EXIM=exim
-PKG_PHPMYADMIN=phpMyAdmin
-PKG_ROUNDCUBE=roundcubemail
+OSAL_PKG_APACHE=httpd
+OSAL_PKG_APACHE_MOD_RUID2=mod_ruid2
+OSAL_PKG_BIND=bind
+OSAL_PKG_EXIM=exim
+OSAL_PKG_PHPMYADMIN=phpMyAdmin
+OSAL_PKG_ROUNDCUBE=roundcubemail
 
 # Paths
-PATH_BIND_DATA=/var/named
-PATH_ROUNDCUBE_INSTALL_MYSQL=/usr/share/roundcubemail/SQL/mysql
+OSAL_PATH_APACHE_CONF=/etc/httpd
+OSAL_PATH_BIND_DATA=/var/named
+OSAL_PATH_ROUNDCUBE_INSTALL_MYSQL=/usr/share/roundcubemail/SQL/mysql
 
 #-------------------------------------------------------------------#
 # Functions                                                         #
@@ -38,80 +39,81 @@ PATH_ROUNDCUBE_INSTALL_MYSQL=/usr/share/roundcubemail/SQL/mysql
 # OS function wrappers
 
 # package_preinstall
-package_preinstall() {
+osal_package_preinstall() {
     true    # Do nothing (on Debian: apt-get update)
 }
 
 # package_install 'package' 'package' ...
-package_install() {
-    $CMD_PACKAGE_MANAGER -q -y install "$@"
+osal_package_install() {
+    $OSAL_CMD_PACKAGE_MANAGER -q -y install "$@"
 }
 
 # package_remoev 'package' 'package' ...
-package_remove() {
-    $CMD_PACKAGE_MANAGER -y remove "$@"
+osal_package_remove() {
+    $OSAL_CMD_PACKAGE_MANAGER -y remove "$@"
 }
 
 # service_start 'service-name'
-service_start() {
+osal_service_start() {
     /usr/bin/systemctl start ${1}.service
 }
 
 # service_stop 'service-name'
-service_stop() {
+osal_service_stop() {
     /usr/bin/systemctl stop ${1}.service
 }
 
 # service_restart 'service-name'
-service_restart() {
+osal_service_restart() {
     /usr/bin/systemctl restart ${1}.service
 }
 
 # service_enable 'service-name'
-service_enable() {
+osal_service_enable() {
     /usr/bin/systemctl enable ${1}.service
 }
 
 # service_disable 'service-name'
-service_disable() {
+osal_service_disable() {
     /usr/bin/systemctl disable ${1}.service
 }
 
 # Software-specific
 
 # apache_module_isenabled 'module_name' = (1|null)
-apache_module_isenabled() {
+osal_apache_module_isenabled() {
     mod_enabled=$(/usr/sbin/httpd -M | grep $1)
     [ "$mod_enabled" ] && echo 1
 }
 
 # apache_module_enable 'module_name'
-apache_module_enable() {
-    /usr/bin/sed -i "/LoadModule ${1}_module/ s/#*//" /etc/httpd/conf.modules.d/*.conf
+osal_apache_module_enable() {
+    // TODO: better way; what if LoadModule line does not exist or starts with more than one #?
+    /usr/bin/sed -i "/LoadModule ${1}_module/ s/#*//" $OSAL_PATH_APACHE_CONF/conf.modules.d/*.conf
 }
 
 # apache_module_disable 'module_name'
-apache_module_disable() {
-    /usr/bin/sed -i "/LoadModule ${1}_module/ s/^/#/" /etc/httpd/conf.modules.d/*.conf
+osal_apache_module_disable() {
+    /usr/bin/sed -i "/LoadModule ${1}_module/ s/^/#/" $OSAL_PATH_APACHE_CONF/conf.modules.d/*.conf
 }
 
 # multiphp_php_package_prefix 7.3 = 'php73-php'
-multiphp_php_package_prefix() {
+osal_multiphp_php_package_prefix() {
     echo php${1//.}-php
 }
 
 # multiphp_fpm_isinstalled 7.3 = (1|null)
-multiphp_fpm_isinstalled() {
-    php_prefix=$(multiphp_php_package_prefix $1)
+osal_multiphp_fpm_isinstalled() {
+    php_prefix=$(osal_multiphp_php_package_prefix $1)
     rpm -q --quiet ${php_prefix}-fpm && echo 1
 }
 
 # multiphp_etc_folder '7.3' = /etc/opt/remi/php73
-multiphp_etc_folder() {
+osal_multiphp_etc_folder() {
     echo /etc/opt/remi/php${1//.}
 }
 
 # multiphp_fpm_pool_d '7.3' = /etc/opt/remi/php$73/php-fpm.d
-multiphp_fpm_pool_d() {
+osal_multiphp_fpm_pool_d() {
     echo /etc/opt/remi/php${1//.}/php-fpm.d
 }