This commit is contained in:
20
install.sh
20
install.sh
@@ -133,12 +133,15 @@ discover_services() {
|
|||||||
check_dirs_and_files() {
|
check_dirs_and_files() {
|
||||||
|
|
||||||
if [ ! -f "$HOME/.ssh/installer" ]; then
|
if [ ! -f "$HOME/.ssh/installer" ]; then
|
||||||
echo "No ssh key files found, exting";
|
echo "No ssh key files found. Please paste base64 content of the installer private key: ";
|
||||||
exit;
|
while read -r INSTALLER; do
|
||||||
else
|
if [ "$INSTALLER" != "" ]; then
|
||||||
chmod 0600 $HOME/.ssh/installer;
|
break;
|
||||||
chmod 0600 $HOME/.ssh/installer.pub;
|
fi;
|
||||||
|
done
|
||||||
|
echo $INSTALLER > $HOME/.ssh/installer;
|
||||||
fi;
|
fi;
|
||||||
|
chmod 0600 $HOME/.ssh/installer;
|
||||||
|
|
||||||
if [ ! -d "/etc/user/config" ]; then
|
if [ ! -d "/etc/user/config" ]; then
|
||||||
$SUDO_CMD mkdir -p "/etc/user/config"
|
$SUDO_CMD mkdir -p "/etc/user/config"
|
||||||
@@ -665,9 +668,6 @@ if [ "$DOCKER_REGISTRY_URL" == "" ]; then
|
|||||||
DOCKER_REGISTRY_URL="registry.format.hu";
|
DOCKER_REGISTRY_URL="registry.format.hu";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/installer-tool
|
|
||||||
$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/setup
|
|
||||||
|
|
||||||
# first install
|
# first install
|
||||||
if [ ! -f "/etc/user/config/system.json" ]; then
|
if [ ! -f "/etc/user/config/system.json" ]; then
|
||||||
|
|
||||||
@@ -744,6 +744,10 @@ if [ ! -f "/etc/user/config/system.json" ]; then
|
|||||||
--env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL \
|
--env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL \
|
||||||
--env LETSENCRYPT_SERVERNAME=$LETSENCRYPT_SERVERNAME \
|
--env LETSENCRYPT_SERVERNAME=$LETSENCRYPT_SERVERNAME \
|
||||||
$DOCKER_REGISTRY_URL/installer-tool
|
$DOCKER_REGISTRY_URL/installer-tool
|
||||||
|
else
|
||||||
|
|
||||||
|
$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/installer-tool
|
||||||
|
$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/setup
|
||||||
|
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user