Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux - run temp nginx to solve let's encrypt challenges

Browse Source
This commit is contained in:
bunkerity 2021-08-17 10:24:40 +02:00
parent 6c8bc6b349
commit a28f06f08f
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
helpers/bunkerized-nginx
View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
# load some functions
. /opt/bunkerized-nginx/entrypoint/utils.sh
function do_and_check_cmd() { function do_and_check_cmd() {
if [ "$CHANGE_DIR" != "" ] ; then if [ "$CHANGE_DIR" != "" ] ; then
cd "$CHANGE_DIR" cd "$CHANGE_DIR"
@ -35,9 +38,25 @@ fi
echo "[*] Generate configuration files" echo "[*] Generate configuration files"
do_and_check_cmd "/opt/bunkerized-nginx/gen/main.py --settings /opt/bunkerized-nginx/settings.json --templates /opt/bunkerized-nginx/confs --output /etc/nginx --variables /opt/bunkerized-nginx/variables.env" do_and_check_cmd "/opt/bunkerized-nginx/gen/main.py --settings /opt/bunkerized-nginx/settings.json --templates /opt/bunkerized-nginx/confs --output /etc/nginx --variables /opt/bunkerized-nginx/variables.env"
# Run temporary nginx if needed
status="$(systemctl status nginx 2>&1)"
if [ $? -ne 0 ] && [ "$(grep "^.*AUTO_LETS_ENCRYPT=yes$" /opt/bunkerized-nginx/variables.env)" != "" ] ; then
echo "[*] Run temp nginx"
do_and_check_cmd "cp /opt/bunkerized-nginx/confs/global/nginx-temp.conf /tmp/nginx-temp.conf"
replace_in_file "/tmp/nginx-temp.conf" "%USE_API%" ""
replace_in_file "/tmp/nginx-temp.conf" "%HTTP_PORT%" "80"
AS_ROOT="yes" do_and_check_cmd nginx -c /tmp/nginx-temp.conf -g 'user nginx;'
fi
# Run pre-jobs # Run pre-jobs
echo "[*] Run jobs" echo "[*] Run jobs"
do_and_check_cmd "/opt/bunkerized-nginx/entrypoint/jobs.sh" CHANGE_DIR=/tmp do_and_check_cmd "/opt/bunkerized-nginx/entrypoint/jobs.sh"
# Stop temp nginx
status="$(systemctl status nginx 2>&1)"
if [ $? -ne 0 ] && [ -f "/tmp/nginx-temp.pid" ] ; then
AS_ROOT="yes" do_and_check_cmd nginx -c /tmp/nginx-temp.conf -s quit
fi
# Reload nginx if it's running # Reload nginx if it's running
status="$(systemctl status nginx 2>&1)" status="$(systemctl status nginx 2>&1)"

2
tests/Dockerfile-ubuntu
View File

@ -1,6 +1,6 @@
FROM ubuntu:focal FROM ubuntu:focal
RUN apt update && apt install -y systemd RUN apt update && apt install -y systemd init
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\ rm -f /lib/systemd/system/multi-user.target.wants/*;\