diff --git a/bin/install-federated b/bin/install-federated index ed2cd9c..3d49f6f 100755 --- a/bin/install-federated +++ b/bin/install-federated @@ -65,7 +65,7 @@ done # Download lib scripts and take in setup variables get_config -echo -ne "\n\nStarting Federated install for $DOMAIN\n" +echo -ne "\nStarting Federated install for $DOMAIN\n" # Check that we have docker installed. Check that # we have all ports available and not in use diff --git a/lib/functions.sh b/lib/functions.sh index 843dc78..766cec7 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -1,5 +1,8 @@ # Federated Computer functions +# Define all services +SERVICES=("dns" "postgresql" "ldap" "mail" "collabora" "proxy" "nextcloud" "matrix" "element" "listmonk" "vaultwarden" "panel" "wireguard" "jitsi" "baserow" "calcom" "gitea" "caddy") + fail() { echo -ne "FAILED\n\n$1\n\n" kill -9 $SPINPID &> /dev/null @@ -28,8 +31,8 @@ spin() { done } add_cron() { - (crontab -l; echo "30 23 * * * /federated/bin/backup.sh >> /federated/logs/backup.log 2>&1") | sort -u | crontab - - (crontab -l; echo "0 2 * * * /federated/bin/upgrade.sh >> /federated/logs/upgrade.log 2>&1") | sort -u | crontab - + (crontab -l 2>/dev/null; echo "30 23 * * * /federated/bin/backup.sh >> /federated/logs/backup.log 2>&1") | sort -u | crontab - + (crontab -l 2>/dev/null; echo "0 2 * * * /federated/bin/upgrade.sh >> /federated/logs/upgrade.log 2>&1") | sort -u | crontab - } install_federated() { [ -d "/federated" ] && fail "Directory /federated already exists. Already installed?" diff --git a/lib/gitea.sh b/lib/gitea.sh index 851b494..318966a 100644 --- a/lib/gitea.sh +++ b/lib/gitea.sh @@ -156,15 +156,15 @@ start_gitea() { [ $? -ne 0 ] && fail "Couldn't mv creategitea.sh inside /federated/apps/gitea container" # Create admin user gitea - docker exec --user 1000 gitea gitea admin user create --admin --username gitea --password $ADMINPASS --email admin@$DOMAIN + docker exec --user 1000 gitea gitea admin user create --admin --username gitea --password $ADMINPASS --email admin@$DOMAIN &> /dev/null [ $? -ne 0 ] && fail "Couldn't run gitea user create inside /federated/apps/gitea container" # Run creategitea.sh inside gitea container - docker exec -it gitea /data/creategitea.sh + docker exec -it gitea /data/creategitea.sh &> /dev/null [ $? -ne 0 ] && fail "Couldn't run creategitea.sh inside /federated/apps/gitea container" # Create token to use for Caddy starting up next - GITEA_TOKEN_1=`docker exec -it gitea curl -H "Content-Type: application/json" -d '{"name":"gitea1","scopes":["all"]}' -u gitea:$ADMINPASS http://gitea.$DOMAIN:3000/api/v1/users/gitea/tokens 2>/dev/null | awk -F: '{ print $4 }' | awk -F\" '{ print $2 }'` + GITEA_TOKEN_1=`docker exec -it gitea curl -H "Content-Type: application/json" -d '{"name":"gitea1","scopes":["all"]}' -u gitea:$ADMINPASS http://gitea.$DOMAIN:3000/api/v1/users/gitea/tokens 2>/dev/null | awk -F: '{ print $4 }' | awk -F\" '{ print $2 }'` &> /dev/null [ $? -ne 0 ] && fail "Couldn't run gitea curl to get token inside /federated/apps/gitea container" kill -9 $SPINPID &> /dev/null