Browse Source

Rename system to stack

old-stable
Mitesh Shah 10 years ago
parent
commit
39d2f14a50
  1. 2
      bin/easyengine
  2. 2
      config/easyengine/ee.conf
  3. 2
      src/lib/ee_lib_gpg_key_fix.sh
  4. 6
      src/lib/ee_lib_variables.sh
  5. 4
      src/modules/stack/ee_mod_stack_status.sh

2
bin/easyengine

@ -170,7 +170,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
fi fi
fi fi
elif [ "$EE_SECOND" = "status" ]; then elif [ "$EE_SECOND" = "status" ]; then
ee_mod_system_status ee_mod_stack_status
elif [ "$EE_SECOND" = "start" ] || [ "$EE_SECOND" = "stop" ] || [ "$EE_SECOND" = "reload" ] || [ "$EE_SECOND" = "restart" ]; then elif [ "$EE_SECOND" = "start" ] || [ "$EE_SECOND" = "stop" ] || [ "$EE_SECOND" = "reload" ] || [ "$EE_SECOND" = "restart" ]; then
ee_lib_service nginx php5-fpm mysql postfix $EE_SECOND ee_lib_service nginx php5-fpm mysql postfix $EE_SECOND
fi fi

2
config/easyengine/ee.conf

@ -1,6 +1,6 @@
# EasyEngine (ee) configuration file # EasyEngine (ee) configuration file
[system] [stack]
apt-get-assume-yes = true apt-get-assume-yes = true
gpg-key-fix = false gpg-key-fix = false
ip-address = ip-address =

2
src/lib/ee_lib_gpg_key_fix.sh

@ -5,7 +5,7 @@ function ee_lib_gpg_key_fix()
local ee_gpg_key_check local ee_gpg_key_check
# GnuPG key check # GnuPG key check
$EE_CONFIG_GET system.gpg-key-fix | grep -i true &>> $EE_COMMAND_LOG $EE_CONFIG_GET stack.gpg-key-fix | grep -i true &>> $EE_COMMAND_LOG
if [ $? -eq 0 ];then if [ $? -eq 0 ];then

6
src/lib/ee_lib_variables.sh

@ -15,8 +15,8 @@ readonly EE_ERROR_LOG=/var/log/easyengine/error.log
readonly EE_LINUX_DISTRO=$(lsb_release -i |awk '{print $3}') readonly EE_LINUX_DISTRO=$(lsb_release -i |awk '{print $3}')
readonly EE_CONFIG_GET=$(echo "git config --file /etc/easyengine/ee.conf") readonly EE_CONFIG_GET=$(echo "git config --file /etc/easyengine/ee.conf")
readonly EE_CONFIG_SET=$(echo "git config --file /etc/easyengine/ee.conf" --replace-all) readonly EE_CONFIG_SET=$(echo "git config --file /etc/easyengine/ee.conf" --replace-all)
readonly EE_IP_ADDRESS=$($EE_CONFIG_GET system.ip-address | cut -d'=' -f2 | sed 's/ //g' | tr ',' '\n') readonly EE_IP_ADDRESS=$($EE_CONFIG_GET stack.ip-address | cut -d'=' -f2 | sed 's/ //g' | tr ',' '\n')
readonly EE_APT_GET=$($EE_CONFIG_GET system.apt-get-assume-yes | grep -i true &> /dev/null && echo apt-get -y || echo apt-get) readonly EE_APT_GET=$($EE_CONFIG_GET stack.apt-get-assume-yes | grep -i true &> /dev/null && echo apt-get -y || echo apt-get)
# Distribution specific variable # Distribution specific variable
if [ "$EE_LINUX_DISTRO" == "Ubuntu" ]; then if [ "$EE_LINUX_DISTRO" == "Ubuntu" ]; then
@ -33,7 +33,7 @@ fi
if [ -f /etc/php5/fpm/pool.d/www.conf ]; then if [ -f /etc/php5/fpm/pool.d/www.conf ]; then
readonly EE_PHP_USER=$(grep ^user /etc/php5/fpm/pool.d/www.conf | cut -d'=' -f2 | cut -d' ' -f2) readonly EE_PHP_USER=$(grep ^user /etc/php5/fpm/pool.d/www.conf | cut -d'=' -f2 | cut -d' ' -f2)
else else
# At installation time: ee system install # At installation time: ee stack install
# File /etc/php5/fpm/pool.d/www.conf not present # File /etc/php5/fpm/pool.d/www.conf not present
readonly EE_PHP_USER=www-data readonly EE_PHP_USER=www-data
fi fi

4
src/modules/stack/ee_mod_system_status.sh → src/modules/stack/ee_mod_stack_status.sh

@ -1,6 +1,6 @@
# Execute: ee system status # Execute: ee stack status
function ee_mod_system_status() function ee_mod_stack_status()
{ {
# Detect operating system # Detect operating system
local ee_operating_system=$(lsb_release -d | awk '{print $2,$3,$4}') local ee_operating_system=$(lsb_release -d | awk '{print $2,$3,$4}')
Loading…
Cancel
Save