mirror of
https://github.com/sstent/containers.git
synced 2026-01-25 16:41:51 +00:00
cleaning up entrypoint
This commit is contained in:
@@ -4,21 +4,6 @@
|
|||||||
# INIT
|
# INIT
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# mkdir -p /root/.ssh
|
|
||||||
# > /root/.ssh/authorized_keys
|
|
||||||
# chmod go-rwx /root/.ssh/authorized_keys
|
|
||||||
# sed -i "s/#PasswordAuthentication yes/PasswordAuthentication no/g" /etc/ssh/sshd_config
|
|
||||||
# sed -i 's/root:!/root:*/' /etc/shadow
|
|
||||||
|
|
||||||
# Provide SSH_AUTH_KEY_* via environment variable
|
|
||||||
for item in `env`; do
|
|
||||||
case "$item" in
|
|
||||||
SSH_AUTH_KEY*)
|
|
||||||
ENVVAR=`echo $item | cut -d \= -f 1`
|
|
||||||
printenv $ENVVAR >> /root/.ssh/authorized_keys
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# Provide CRON_TASK_* via environment variable
|
# Provide CRON_TASK_* via environment variable
|
||||||
> /etc/crontabs/root
|
> /etc/crontabs/root
|
||||||
@@ -32,46 +17,6 @@ for item in `env`; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
# Generate host SSH keys
|
|
||||||
# if [ ! -e /etc/ssh/ssh_host_rsa_key.pub ]; then
|
|
||||||
# ssh-keygen -A
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# Generate root SSH key
|
|
||||||
# if [ ! -e /root/.ssh/id_rsa.pub ]; then
|
|
||||||
# ssh-keygen -q -N "" -f /root/.ssh/id_rsa
|
|
||||||
# fi
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# START as SERVER
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
# if [ "$1" == "server" ]; then
|
|
||||||
# AUTH=`cat /root/.ssh/authorized_keys`
|
|
||||||
# if [ -z "$AUTH" ]; then
|
|
||||||
# echo "=================================================================================="
|
|
||||||
# echo "ERROR: No SSH_AUTH_KEY provided, you'll not be able to connect to this container. "
|
|
||||||
# echo "=================================================================================="
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# SSH_PARAMS="-D -e -p ${SSH_PORT:-22} $SSH_PARAMS"
|
|
||||||
# echo "================================================================================"
|
|
||||||
# echo "Running: /usr/sbin/sshd $SSH_PARAMS "
|
|
||||||
# echo "================================================================================"
|
|
||||||
|
|
||||||
# exec /usr/sbin/sshd -D $SSH_PARAMS
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# echo "Please add this ssh key to your server /home/user/.ssh/authorized_keys "
|
|
||||||
# echo "================================================================================"
|
|
||||||
# echo "`cat /root/.ssh/id_rsa.pub`"
|
|
||||||
# echo "================================================================================"
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# START as CLIENT via crontab
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
if [ "$1" == "client" ]; then
|
if [ "$1" == "client" ]; then
|
||||||
exec /usr/sbin/crond -f
|
exec /usr/sbin/crond -f
|
||||||
fi
|
fi
|
||||||
@@ -88,7 +33,7 @@ if [ "$NOMAD_TASK_NAME" == "init" ]; then
|
|||||||
/usr/local/bin/litestream restore -config /local/litestream.yml /config/${DB_NAME}
|
/usr/local/bin/litestream restore -config /local/litestream.yml /config/${DB_NAME}
|
||||||
chown ${PUID:-1000}:${PGID:-1000} /config/*.db*
|
chown ${PUID:-1000}:${PGID:-1000} /config/*.db*
|
||||||
if [ -n "$DBCHMOD" ]; then
|
if [ -n "$DBCHMOD" ]; then
|
||||||
chmod ${DBCHMOD} /config/${DB_NAME:${NOMAD_GROUP_NAME}}.db;
|
chmod ${DBCHMOD} /config/${DB_NAME}.db;
|
||||||
fi
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@@ -102,7 +47,7 @@ fi
|
|||||||
if [ "$NOMAD_TASK_NAME" == "db-sync" ]; then
|
if [ "$NOMAD_TASK_NAME" == "db-sync" ]; then
|
||||||
echo "Starting DBsync: sleep"
|
echo "Starting DBsync: sleep"
|
||||||
#give time for app to datart properly
|
#give time for app to datart properly
|
||||||
sleep 15m
|
sleep ${SLEEPTIME:-15m}
|
||||||
echo "Starting DBsync"
|
echo "Starting DBsync"
|
||||||
exec flock -x /configbackup/${NOMAD_GROUP_NAME}_litesync.lock /usr/local/bin/litestream replicate -config /local/litestream.yml
|
exec flock -x /configbackup/${NOMAD_GROUP_NAME}_litesync.lock /usr/local/bin/litestream replicate -config /local/litestream.yml
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
Reference in New Issue
Block a user