diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1662729d..71a5c009b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: steps: - name: "Check out NIPAP repository" - uses: actions/checkout@v2 + uses: actions/checkout@v7 - name: "Install dependencies and prepare NIPAP" run: | @@ -175,26 +175,31 @@ jobs: docker: name: docker runs-on: ubuntu-24.04 + env: + PUBLISH_DOCKER: >- + ${{ github.repository == 'SpriteLink/NIPAP' && + github.event_name == 'push' && + github.ref == 'refs/heads/master' }} steps: - name: "Set up QEMU" - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: "Set up Docker Buildx" - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: "Check out NIPAP repository" - uses: actions/checkout@v2 + uses: actions/checkout@v7 - name: "Hadolint nipapd" - uses: hadolint/hadolint-action@v3.1.0 + uses: hadolint/hadolint-action@v3.5.0 with: dockerfile: Dockerfile.nipapd failure-threshold: warning override-info: DL3013 - name: "Hadolint WWW" - uses: hadolint/hadolint-action@v3.1.0 + uses: hadolint/hadolint-action@v3.5.0 with: dockerfile: Dockerfile.www failure-threshold: warning @@ -202,14 +207,14 @@ jobs: - name: "nipapd metadata" id: nipapd_meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ env.NIPAPD_IMAGE }} tags: | type=sha,prefix= - name: "Build nipapd Docker image" - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v7 with: context: . file: ./Dockerfile.nipapd @@ -221,14 +226,14 @@ jobs: - name: "www metadata" id: www_meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ env.WWW_IMAGE }} tags: | type=sha,prefix= - name: "Build www Docker image" - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v7 with: context: . file: ./Dockerfile.www @@ -277,15 +282,15 @@ jobs: nosetests3 tests/test_rest.py - name: "Login to Docker Hub" - if: ${{ github.ref_name == 'master' }} - uses: docker/login-action@v3 + if: ${{ env.PUBLISH_DOCKER == 'true' }} + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: "Build and push nipapd Docker image" - if: ${{ github.ref_name == 'master' }} - uses: docker/build-push-action@v5 + if: ${{ env.PUBLISH_DOCKER == 'true' }} + uses: docker/build-push-action@v7 with: context: . file: ./Dockerfile.nipapd @@ -294,8 +299,8 @@ jobs: push: true - name: "Build and push www Docker image" - if: ${{ github.ref_name == 'master' }} - uses: docker/build-push-action@v5 + if: ${{ env.PUBLISH_DOCKER == 'true' }} + uses: docker/build-push-action@v7 with: context: . file: ./Dockerfile.www diff --git a/Dockerfile.www b/Dockerfile.www index 7d16fa9da..5d5ed5b4a 100644 --- a/Dockerfile.www +++ b/Dockerfile.www @@ -29,7 +29,9 @@ LABEL org.opencontainers.image.authors="Kristian Larsson /dev/null) ]; then echo -n rm -f $PIDFILE > /dev/null 2>&1 @@ -74,7 +79,7 @@ case "$1" in log_daemon_msg "Stopping NIPAPd XML-RPC server" "nipapd" RUNNING=$(running) if [ -n "$RUNNING" ]; then - if start-stop-daemon --stop --pidfile $PIDFILE --retry 30; then + if start-stop-daemon --stop --name $DAEMON_NAME --pidfile $PIDFILE --retry 30; then log_end_msg 0 else log_end_msg 1 @@ -87,7 +92,7 @@ case "$1" in log_daemon_msg "Reloading NIPAPd XML-RPC server's configuration" "nipapd" RUNNING=$(running) if [ -n "$RUNNING" ]; then - if start-stop-daemon --stop --signal HUP --pidfile $PIDFILE; then + if start-stop-daemon --stop --name $DAEMON_NAME --signal HUP --pidfile $PIDFILE; then log_end_msg 0 else log_end_msg 1 @@ -103,7 +108,7 @@ case "$1" in log_daemon_msg "Restarting NIPAPd XML-RPC server" "nipapd" RUNNING=$(running) if [ -n "$RUNNING" ]; then - if start-stop-daemon --stop --pidfile $PIDFILE; then + if start-stop-daemon --stop --name $DAEMON_NAME --pidfile $PIDFILE --retry 30; then if start-stop-daemon --start --exec $DAEMON -- -c $CONFIGFILE $ARGS; then log_end_msg 0 else diff --git a/nipap/debian/nipapd.install b/nipap/debian/nipapd.install index 1191cf61c..6f2ea49b4 100644 --- a/nipap/debian/nipapd.install +++ b/nipap/debian/nipapd.install @@ -4,3 +4,4 @@ usr/share/nipap usr/share/nipap/nipap.conf.dist etc/nipap usr/share/man/man8/nipapd.8 usr/share/man/man1/nipap-passwd.1 +debian/nipapd.service.d/*.conf usr/lib/systemd/system/nipapd.service.d diff --git a/nipap/debian/nipapd.postinst b/nipap/debian/nipapd.postinst index 35f5f8c16..b14b75bef 100644 --- a/nipap/debian/nipapd.postinst +++ b/nipap/debian/nipapd.postinst @@ -147,6 +147,9 @@ case "$1" in db_stop + if [ -d /run/systemd/system ]; then + systemctl daemon-reload + fi # finally start nipapd invoke-rc.d nipapd start ;; diff --git a/nipap/debian/nipapd.service.d/stop.conf b/nipap/debian/nipapd.service.d/stop.conf new file mode 100644 index 000000000..fed4f50e6 --- /dev/null +++ b/nipap/debian/nipapd.service.d/stop.conf @@ -0,0 +1,3 @@ +[Service] +KillMode=control-group +TimeoutStopSec=70s diff --git a/nipap/debian/rules b/nipap/debian/rules index 6c85ecbb0..9f6c14e0f 100755 --- a/nipap/debian/rules +++ b/nipap/debian/rules @@ -3,6 +3,11 @@ # This file was automatically generated by stdeb 0.6.0+git at # Tue, 18 Oct 2011 21:55:07 +0200 export DH_VERBOSE=1 +export PYBUILD_SYSTEM=pyproject %: dh $@ --with python3 --buildsystem=pybuild + +override_dh_auto_build: + $(MAKE) sql2py + dh_auto_build diff --git a/nipap/nipap/nipapd.py b/nipap/nipap/nipapd.py index 8915cc2a3..0317a1d96 100644 --- a/nipap/nipap/nipapd.py +++ b/nipap/nipap/nipapd.py @@ -41,10 +41,12 @@ def exit_cleanup(): except psutil.NoSuchProcess: return - children = p.children - - for pid in children(recursive=True): - os.kill(pid.pid, signal.SIGTERM) + for child in p.children(recursive=True): + try: + os.kill(child.pid, signal.SIGTERM) + except ProcessLookupError: + # A child may already have exited during shutdown. + pass @atexit.register @@ -55,9 +57,9 @@ def at_exit(): def handle_sigterm(sig, frame): """ Handle SIGTERM """ - exit_cleanup() - # and make a clean exit ourselves - # sys.exit(0) + # Let atexit clean up children, and avoid re-entering during shutdown. + signal.signal(signal.SIGTERM, signal.SIG_IGN) + sys.exit(0) # register signal handler for SIGTERM @@ -260,6 +262,8 @@ def run(): except IOError: logger.error('NIPAPd already running (pid: ' + lf.read().strip() + ')') sys.exit(1) + # Daemonization resets umask; restrict PID file writes to its owner. + os.fchmod(lf.fileno(), 0o644) logger.debug('Writing PID to file: ' + cfg.get('nipapd', 'pid_file')) lf.truncate(0) lf.write('%d\n' % os.getpid()) diff --git a/nipap/setup.py b/nipap/setup.py index 441001f7f..b5b90d47e 100644 --- a/nipap/setup.py +++ b/nipap/setup.py @@ -26,6 +26,7 @@ def get_data_files(): 'sql/upgrade-4-5.plsql', 'sql/upgrade-5-6.plsql', 'sql/upgrade-6-7.plsql', + 'sql/upgrade-7-8.plsql', 'sql/functions.plsql', 'sql/triggers.plsql', 'sql/ip_net.plsql',