ixvd/neb
ixvd/neb
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

fix: various minor bugs

Browse source
This commit is contained in:
Strix 2023-10-20 02:43:56 +02:00
parent 7d9241c000
commit db4f5eca5f
No known key found for this signature in database
GPG key ID: 49B2E37B8915B774
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
servers/skel/docker-compose.d/custom/nginx/Dockerfile
View file

@ -10,3 +10,4 @@ COPY nginx.conf /etc/nginx/nginx.conf
COPY entrypoint.sh /entrypoint COPY entrypoint.sh /entrypoint
ENTRYPOINT [ "sh", "/entrypoint" ] ENTRYPOINT [ "sh", "/entrypoint" ]
CMD [ "nginx", "-g", "daemon off;" ]

2
servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf
View file

@ -18,6 +18,8 @@ server {
listen 443 ssl; listen 443 ssl;
server_name localhost; server_name localhost;
# SSL will be managed by certbot, no need to insert SSL config.
location / { location / {
proxy_pass http://$host$request_uri; proxy_pass http://$host$request_uri;
} }

6
servers/skel/docker-compose.d/custom/nginx/entrypoint.sh
View file

@ -3,6 +3,7 @@
trap exit TERM trap exit TERM
if [ -n "${CERTBOT_DOMAINS}" ]; then if [ -n "${CERTBOT_DOMAINS}" ]; then
sleep 5
echo "registering domains..." echo "registering domains..."
certbot --nginx -n --agree-tos \ certbot --nginx -n --agree-tos \
@ -12,11 +13,10 @@ if [ -n "${CERTBOT_DOMAINS}" ]; then
while :; do while :; do
echo "renewing domains..." echo "renewing domains..."
certbot --nginx -n renew certbot --nginx -n renew
nginx -s reload
sleep 12h & wait $! sleep 12h & wait $!
done & done &
else else
echo "skipping certbot due to no domains!" echo "skipping certbot due to no domains!"
fi fi &
exec nginx -g "daemon off;" exec "$@"

1
tools/repo/setup-server-folder.sh
View file

@ -3,5 +3,6 @@
if ! [ -d "servers/${1:-$HOSTNAME}" ]; then if ! [ -d "servers/${1:-$HOSTNAME}" ]; then
echo "setting up servers/${1:-$HOSTNAME}..." echo "setting up servers/${1:-$HOSTNAME}..."
cp -r servers/skel/. servers/${1:-$HOSTNAME} cp -r servers/skel/. servers/${1:-$HOSTNAME}
sed -i "s/localhost/${1:-$HOSTNAME}.ixvd.net/g" servers/${1:-$HOSTNAME}/docker-compose.d/custom/nginx/conf.d/default.conf
echo "server configuration for \`${1:-$HOSTNAME}\`." >servers/${1:-$HOSTNAME}/README.md echo "server configuration for \`${1:-$HOSTNAME}\`." >servers/${1:-$HOSTNAME}/README.md
fi fi

3
tools/setup/05-install-packages.sh
View file

@ -7,5 +7,6 @@ if grep -q "debian" /etc/os-release; then
cifs-utils \ cifs-utils \
restic \ restic \
docker.io \ docker.io \
docker-compose docker-compose \
apparmor
fi fi