Fixed proxy with max client body size, switched other services to start_service
This commit is contained in:
root
parent
bccf2d570f
commit
8600b38fb6
@ -64,38 +64,9 @@ chmod 600 /federated/apps/collabora/.env
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
}
|
||||
|
||||
start_collabora() {
|
||||
# Start /federated/apps/collabora with output to /dev/null
|
||||
echo -ne "\n* Starting /federated/apps/collabora service.."
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
if [ $DEBUG ]; then
|
||||
# Start /federated/apps/collabora with output to console for debug
|
||||
docker-compose -f /federated/apps/collabora/docker-compose.yml -p collabora up
|
||||
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/collabora"
|
||||
else
|
||||
docker-compose -f /federated/apps/collabora/docker-compose.yml -p collabora up -d &> /dev/null
|
||||
|
||||
# Keep trying collabora port 9980 to make sure it's up
|
||||
# before we proceed
|
||||
RETRY="30"
|
||||
while [ $RETRY -gt 0 ]; do
|
||||
nc -z 172.99.0.14 9980 &> /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
else
|
||||
if [ "$RETRY" == 1 ]; then
|
||||
docker-compose -f /federated/apps/collabora/docker-compose.yml -p collabora down &> /dev/null
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
fail "There was a problem starting service /federated/apps/collabora\nCheck the output of 'docker logs collabora' or turn on\ndebug with -d"
|
||||
fi
|
||||
((RETRY--))
|
||||
sleep 7
|
||||
fi
|
||||
done
|
||||
fi
|
||||
start_vaultwarden() {
|
||||
# Start service with command to make sure it's up before proceeding
|
||||
start_service "collabora" "nc -z 172.99.0.14 9980 &> /dev/null"
|
||||
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
|
||||
33
lib/ldap.sh
33
lib/ldap.sh
@ -161,38 +161,9 @@ chmod +x /federated/apps/ldap/data/root/ldap.sh
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
}
|
||||
|
||||
start_ldap() {
|
||||
# Start /federated/apps/ldap with output to /dev/null
|
||||
echo -ne "\n* Starting /federated/apps/ldap service.."
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
if [ $DEBUG ]; then
|
||||
# Start /federated/apps/ldap with output to console for debug
|
||||
docker-compose -f /federated/apps/ldap/docker-compose.yml -p ldap up
|
||||
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/ldap"
|
||||
else
|
||||
docker-compose -f /federated/apps/ldap/docker-compose.yml -p ldap up -d &> /dev/null
|
||||
|
||||
# Keep trying ldap port to make sure it's up
|
||||
# before we proceed
|
||||
RETRY="35"
|
||||
while [ $RETRY -gt 0 ]; do
|
||||
nc -z 172.99.0.12 636 &> /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
else
|
||||
if [ "$RETRY" == 1 ]; then
|
||||
docker-compose -f /federated/apps/ldap/docker-compose.yml -p ldap down &> /dev/null
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
fail "There was a problem starting service /federated/apps/ldap\nCheck the output of 'docker logs ldap' or turn on\ndebug with -d"
|
||||
fi
|
||||
((RETRY--))
|
||||
sleep 7
|
||||
fi
|
||||
done
|
||||
fi
|
||||
# Start service with command to make sure it's up before proceeding
|
||||
start_service "ldap" "nc -z 172.99.0.12 636 &> /dev/null"
|
||||
|
||||
# Run our ldap.sh script inside the ldap container
|
||||
# This imports the inital LDAP configuration
|
||||
|
||||
32
lib/mail.sh
32
lib/mail.sh
@ -110,37 +110,9 @@ EOF
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
}
|
||||
|
||||
start_mail() {
|
||||
echo -ne "\n* Starting /federated/apps/mail service.."
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
if [ $DEBUG ]; then
|
||||
# Start /federated/apps/mail with output to console for debug
|
||||
docker-compose -f /federated/apps/mail/docker-compose.yml -p mail up
|
||||
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/mail"
|
||||
else
|
||||
docker-compose -f /federated/apps/mail/docker-compose.yml -p mail up -d &> /dev/null
|
||||
|
||||
# Keep trying mail port 25 to make sure it's up
|
||||
# before we proceed
|
||||
RETRY="23"
|
||||
while [ $RETRY -gt 0 ]; do
|
||||
nc -z 172.99.0.13 25 &> /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
else
|
||||
if [ "$RETRY" == 1 ]; then
|
||||
docker-compose -f /federated/apps/mail/docker-compose.yml -p mail down &> /dev/null
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
fail "There was a problem starting service /federated/apps/mail\nCheck the output of 'docker logs mail' or turn on\ndebug with -d"
|
||||
fi
|
||||
((RETRY--))
|
||||
sleep 7
|
||||
fi
|
||||
done
|
||||
fi
|
||||
# Start service with command to make sure it's up before proceeding
|
||||
start_service "mail" "nc -z 172.99.0.13 25 &> /dev/null"
|
||||
|
||||
# Generate the DKIM DNS key
|
||||
docker exec -it mail setup config dkim keysize 2048 domain $DOMAIN &> /dev/null
|
||||
|
||||
@ -94,38 +94,9 @@ EOF
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
}
|
||||
|
||||
start_matrix() {
|
||||
# Start /federated/apps/matrix with output to /dev/null
|
||||
echo -ne "\n* Starting /federated/apps/matrix service.."
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
if [ $DEBUG ]; then
|
||||
# Start /federated/apps/matrix with output to console for debug
|
||||
docker-compose -f /federated/apps/matrix/docker-compose.yml -p matrix up
|
||||
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/matrix"
|
||||
else
|
||||
docker-compose -f /federated/apps/matrix/docker-compose.yml -p matrix up -d &> /dev/null
|
||||
|
||||
# Keep trying matrix port 8008 to make sure it's up
|
||||
# before we proceed
|
||||
RETRY="30"
|
||||
while [ $RETRY -gt 0 ]; do
|
||||
nc -z 172.99.0.17 8008 &> /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
else
|
||||
if [ "$RETRY" == 1 ]; then
|
||||
docker-compose -f /federated/apps/matrix/docker-compose.yml -p matrix down &> /dev/null
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
fail "There was a problem starting service /federated/apps/matrix\nCheck the output of 'docker logs matrix' or turn on\ndebug with -d"
|
||||
fi
|
||||
((RETRY--))
|
||||
sleep 7
|
||||
fi
|
||||
done
|
||||
fi
|
||||
# Start service with command to make sure it's up before proceeding
|
||||
start_service "matrix" "nc -z 172.99.0.17 8008 &> /dev/null"
|
||||
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
|
||||
38
lib/proxy.sh
38
lib/proxy.sh
@ -38,6 +38,7 @@ services:
|
||||
volumes:
|
||||
- /var/run/docker.sock:/tmp/docker.sock:ro
|
||||
- ./data/root/certs:/etc/nginx/certs
|
||||
- ./data/custom.conf:/etc/nginx/conf.d/custom.conf:ro
|
||||
|
||||
networks:
|
||||
federated:
|
||||
@ -49,41 +50,16 @@ IMAGE_VERSION="1.1"
|
||||
EOF
|
||||
chmod 600 /federated/apps/proxy/.env
|
||||
|
||||
cat > /federated/apps/proxy/data/custom.conf <<EOF
|
||||
client_max_body_size 64000M;
|
||||
EOF
|
||||
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
}
|
||||
|
||||
start_proxy() {
|
||||
# Start /federated/apps/proxy with output to /dev/null
|
||||
echo -ne "\n* Starting /federated/apps/proxy service.."
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
if [ $DEBUG ]; then
|
||||
# Start /federated/apps/proxy with output to console for debug
|
||||
docker-compose -f /federated/apps/proxy/docker-compose.yml -p proxy up
|
||||
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/proxy"
|
||||
else
|
||||
docker-compose -f /federated/apps/proxy/docker-compose.yml -p proxy up -d &> /dev/null
|
||||
|
||||
# Keep trying proxy port 443 to make sure it's up
|
||||
# before we proceed
|
||||
RETRY="23"
|
||||
while [ $RETRY -gt 0 ]; do
|
||||
nc -z 172.99.0.15 443 &> /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
else
|
||||
if [ "$RETRY" == 1 ]; then
|
||||
docker-compose -f /federated/apps/proxy/docker-compose.yml -p proxy down &> /dev/null
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
fail "There was a problem starting service /federated/apps/proxy\nCheck the output of 'docker logs proxy' or turn on\ndebug with -d"
|
||||
fi
|
||||
((RETRY--))
|
||||
sleep 7
|
||||
fi
|
||||
done
|
||||
fi
|
||||
# Start service with command to make sure it's up before proceeding
|
||||
start_service "proxy" "nc -z 172.99.0.15 443 &> /dev/null"
|
||||
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done."
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user