Skip to content

Commit

Permalink
4.0.1 small enhancements for container installs
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel-Nashed committed Sep 11, 2024
1 parent 4118945 commit 0012cce
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
25 changes: 14 additions & 11 deletions install_script
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

###########################################################################
# Install Script - Start/Stop Script for Domino on xLinux/zLinux/AIX #
# Version 4.0.0 16.07:2024 #
# Version 4.0.1 07.08:2024 #
# #
# (C) Copyright Daniel Nashed/NashCom 2005-2024 #
# Feedback [email protected] #
Expand Down Expand Up @@ -32,7 +32,7 @@ DOMINO_DOCKER_SCRIPT=entrypoint.sh
DONT_TOUCH_THIS_NASHCOM_PATH=/opt/nashcom/startscript
DONT_TOUCH_THIS_STANDARD_USER=notes

DOMINO_SCRIPT_VERSION=4.0.0
DOMINO_SCRIPT_VERSION=4.0.1

# if you really really need to, change this and all files will be patched

Expand Down Expand Up @@ -402,10 +402,12 @@ if [ -n "$CONTAINER_ENV" ] || [ "$CONTAINER_USE_SYSTEMD" = "yes" ]; then
header "${CONTAINER_ENV} container environment detected!"
fi

if [ "$PARAM1" = "upd" ]; then
install_file "$START_SCRIPT_DIR/$DOMINO_DOCKER_SCRIPT" "/$DOMINO_DOCKER_SCRIPT" $ROOT_USER $ROOT_GROUP 755
else
install_file_noupdate "$START_SCRIPT_DIR/$DOMINO_DOCKER_SCRIPT" "/$DOMINO_DOCKER_SCRIPT" $ROOT_USER $ROOT_GROUP 755
if [ -e "$START_SCRIPT_DIR/$DOMINO_DOCKER_SCRIPT" ]; then
if [ "$PARAM1" = "upd" ]; then
install_file "$START_SCRIPT_DIR/$DOMINO_DOCKER_SCRIPT" "/$DOMINO_DOCKER_SCRIPT" $ROOT_USER $ROOT_GROUP 755
else
install_file_noupdate "$START_SCRIPT_DIR/$DOMINO_DOCKER_SCRIPT" "/$DOMINO_DOCKER_SCRIPT" $ROOT_USER $ROOT_GROUP 755
fi
fi
fi

Expand All @@ -418,17 +420,18 @@ if [ ${LARCH} = "linux" ]; then
else
install_file_noupdate $START_SCRIPT_DIR/domino.service /etc/systemd/system/$DOMINO_SYSTEMD_NAME $ROOT_USER $ROOT_GROUP 644
fi

if [ $? -eq 2 ]; then
systemctl daemon-reload
fi
fi

patch_install_dir "/etc/systemd/system/$DOMINO_SYSTEMD_NAME"
patch_user_name "/etc/systemd/system/$DOMINO_SYSTEMD_NAME"

# add domino service (systemd/init.d)
$DOMINO_SCRIPT_BIN service add
if [ -z "$(ps --no-headers -o comm 1 | grep systemd)" ]; then
echo "Info: System is not running systemd"
else
systemctl daemon-reload
$DOMINO_SCRIPT_BIN service add
fi

fi

Expand Down
2 changes: 1 addition & 1 deletion rc_domino
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# You may use and distribute the unmodified version of this script.
# Use at your own risk. No implied or specific warranties are given.
# You may change it for your own usage only
# Version 4.0.0 16.07.2024
# Version 4.0.1 07.08:2024
###########################################################################
# chkconfig: 345 66 19
# description: HCL Domino Server (notes)
Expand Down
4 changes: 2 additions & 2 deletions rc_domino_script
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

###########################################################################
# Main Script Logic - Start/Stop Script for Domino on xLinux/zLinux/AIX #
# Version 4.0.0 16.07.2024 #
# Version 4.0.1 07.08:2024 #
# #
# (C) Copyright Daniel Nashed/NashCom 2005-2024 #
# Feedback [email protected] #
Expand All @@ -21,7 +21,7 @@
# limitations under the License. #
###########################################################################

DOMINO_SCRIPT_VERSION=4.0.0
DOMINO_SCRIPT_VERSION=4.0.1

if [ -z "$DOMINO_SCRIPT_VERBOSE_INFO" ]; then
DOMINO_SCRIPT_VERBOSE_INFO="yes"
Expand Down

0 comments on commit 0012cce

Please sign in to comment.