Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package containers-systemd for openSUSE:Factory checked in at 2021-02-25 18:26:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old) and /work/SRC/openSUSE:Factory/.containers-systemd.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd" Thu Feb 25 18:26:19 2021 rev:23 rq:874368 version:0.0+git20210222.f3de7fa Changes: -------- --- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes 2021-02-11 12:48:15.785565375 +0100 +++ /work/SRC/openSUSE:Factory/.containers-systemd.new.2378/containers-systemd.changes 2021-02-25 18:26:21.490136903 +0100 @@ -1,0 +2,8 @@ +Mon Feb 22 14:39:31 UTC 2021 - [email protected] + +- Update to version 0.0+git20210222.f3de7fa: + * Rewrite based on podman changes + * Correct TimeoutStopSec to 70 + * Replace KillMode=none with TimeoutStopSec + +------------------------------------------------------------------- Old: ---- containers-systemd-0.0+git20210205.a4b07b6.tar.xz New: ---- containers-systemd-0.0+git20210222.f3de7fa.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containers-systemd.spec ++++++ --- /var/tmp/diff_new_pack.k8X6DG/_old 2021-02-25 18:26:22.166137393 +0100 +++ /var/tmp/diff_new_pack.k8X6DG/_new 2021-02-25 18:26:22.166137393 +0100 @@ -26,7 +26,7 @@ %endif Name: containers-systemd -Version: 0.0+git20210205.a4b07b6 +Version: 0.0+git20210222.f3de7fa Release: 0 Summary: Systemd service files and config files for openSUSE container License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.k8X6DG/_old 2021-02-25 18:26:22.214137428 +0100 +++ /var/tmp/diff_new_pack.k8X6DG/_new 2021-02-25 18:26:22.214137428 +0100 @@ -1,5 +1,5 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kubic-project/containers-systemd.git</param> - <param name="changesrevision">a4b07b655d0223291c07b5e2120c88393cb770ce</param></service> + <param name="changesrevision">f3de7fab0a304e4d952f3c332a9f5517cc04fd2c</param></service> </servicedata> \ No newline at end of file ++++++ containers-systemd-0.0+git20210205.a4b07b6.tar.xz -> containers-systemd-0.0+git20210222.f3de7fa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-bind.default new/containers-systemd-0.0+git20210222.f3de7fa/container-bind.default --- old/containers-systemd-0.0+git20210205.a4b07b6/container-bind.default 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-bind.default 2021-02-22 15:38:35.000000000 +0100 @@ -7,3 +7,5 @@ # Name of the path where the configuration will be stored CONFIG_DIR="/srv/bind" +# Ports which bind should use +BIND_PORTS="-p 53:53/tcp -p 53:53/udp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-bind.service new/containers-systemd-0.0+git20210222.f3de7fa/container-bind.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-bind.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-bind.service 2021-02-22 15:38:35.000000000 +0100 @@ -5,18 +5,19 @@ Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-bind EnvironmentFile=-/etc/default/container-bind -ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} -ExecStartPre=-/usr/bin/podman stop bind -ExecStartPre=-/usr/bin/podman rm bind -ExecStartPre=-/usr/bin/podman pull ${BIND_IMAGE_PATH} -ExecStart=/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v ${CONFIG_DIR}:/data -p 53:53/tcp -p 53:53/udp --name bind ${BIND_IMAGE_PATH} -ExecStop=/usr/bin/podman stop bind -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${CONFIG_DIR}:/data ${BIND_PORTS} --name bind ${BIND_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-dhcp-server.service new/containers-systemd-0.0+git20210222.f3de7fa/container-dhcp-server.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-dhcp-server.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-dhcp-server.service 2021-02-22 15:38:35.000000000 +0100 @@ -5,18 +5,19 @@ Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-dhcp-server EnvironmentFile=-/etc/default/container-dhcp-server -ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} -ExecStartPre=-/usr/bin/podman stop dhcp-server -ExecStartPre=-/usr/bin/podman rm dhcp-server -ExecStartPre=-/usr/bin/podman pull ${DHCPD_IMAGE_PATH} -ExecStart=/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v ${CONFIG_DIR}:/data --net=host --name dhcp-server --env DHCPD_IP_PROTOCOL=4 --env DHCPD_INTERFACES=${DHCPD_INTERFACES} ${DHCPD_IMAGE_PATH} -ExecStop=/usr/bin/podman stop dhcp-server -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${CONFIG_DIR}:/data --net=host --name dhcp-server --env DHCPD_IP_PROTOCOL=4 --env DHCPD_INTERFACES=${DHCPD_INTERFACES} ${DHCPD_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-dhcp6-server.service new/containers-systemd-0.0+git20210222.f3de7fa/container-dhcp6-server.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-dhcp6-server.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-dhcp6-server.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,22 +1,24 @@ [Unit] Description=openSUSE dhcp6 server container Documentation=https://en.opensuse.org/Portal:Container/Image/dhcp-server -After=network-online.target +After=network-online.target local-fs.target firewalld.service Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-dhcp-server EnvironmentFile=-/etc/default/container-dhcp-server ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} -ExecStartPre=-/usr/bin/podman stop dhcp6-server -ExecStartPre=-/usr/bin/podman rm dhcp6-server -ExecStartPre=-/usr/bin/podman pull ${DHCPD_IMAGE_PATH} -ExecStart=/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v ${CONFIG_DIR}:/data --net=host --name dhcp6-server --env DHCPD_IP_PROTOCOL=6 --env DHCPD_INTERFACES=${DHCPD_INTERFACES} ${DHCPD_IMAGE_PATH} -ExecStop=/usr/bin/podman stop dhcp6-server -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${CONFIG_DIR}:/data --net=host --name dhcp6-server --env DHCPD_IP_PROTOCOL=6 --env DHCPD_INTERFACES=${DHCPD_INTERFACES} ${DHCPD_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-dovecot.service new/containers-systemd-0.0+git20210222.f3de7fa/container-dovecot.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-dovecot.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-dovecot.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,22 +1,24 @@ [Unit] Description=openSUSE dovecot container -Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-dovecot-image +Documentation=https://github.com/thkukuk/containers-mailserver/blob/master/dovecot/README.md After=network-online.target local-fs.target firewalld.service Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-dovecot EnvironmentFile=-/etc/default/container-dovecot ExecStartPre=-/usr/bin/mkdir -p ${DOVECOT_CERTS_DIR} ${DOVECOT_VMAIL_DIR} ${EXTRA_PKI_DIR} -ExecStartPre=-/usr/bin/podman stop dovecot -ExecStartPre=-/usr/bin/podman rm dovecot -ExecStartPre=-/usr/bin/podman pull ${DOVECOT_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid ${PODMAN_EXTRA_ARGS} -v ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v ${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/dovecot-secrets:Z ${DOVECOT_PORTS} -e USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e DOVECOT_TLS_CRT=${DOVECOT_TLS_CRT} -e DOVECOT_TLS_KEY=${DOVECOT_TLS_KEY} -e DOVECOT_TLS_CA_CRT=${DOVECOT_TLS_CA_CRT} -e DOVECOT_TLS_CA_KEY=${DOVECOT_TLS_CA_KEY} -e ENABLE_IMAP=${ENABLE_IMAP} -e ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name dovecot ${DOVECOT_IMAGE_PATH}" -ExecStop=/usr/bin/podman stop dovecot -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v ${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/dovecot-secrets:Z ${DOVECOT_PORTS} -e USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e DOVECOT_TLS_CRT=${DOVECOT_TLS_CRT} -e DOVECOT_TLS_KEY=${DOVECOT_TLS_KEY} -e DOVECOT_TLS_CA_CRT=${DOVECOT_TLS_CA_CRT} -e DOVECOT_TLS_CA_KEY=${DOVECOT_TLS_CA_KEY} -e ENABLE_IMAP=${ENABLE_IMAP} -e ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name dovecot ${DOVECOT_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-fetchmail.service new/containers-systemd-0.0+git20210222.f3de7fa/container-fetchmail.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-fetchmail.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-fetchmail.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,21 +1,23 @@ [Unit] Description=openSUSE fetchmail container -Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-fetchmail-image +Documentation=https://github.com/thkukuk/containers-mailserver/blob/master/fetchmail/README.md After=network-online.target local-fs.target firewalld.service Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-fetchmail EnvironmentFile=-/etc/default/container-fetchmail -ExecStartPre=-/usr/bin/podman stop fetchmail -ExecStartPre=-/usr/bin/podman rm fetchmail -ExecStartPre=-/usr/bin/podman pull ${FETCHMAIL_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${FETCHMAILRC}:/etc/fetchmailrc:ro -e POLLING_INTERVAL=${POLLING_INTERVAL} -e FETCHALL=${FETCHALL} -e SILENT=${SILENT} -e SMTP_HOSTS=${SMTP_HOSTS} -e DEBUG=${DEBUG} -e TZ=${TZ} --name fetchmail ${FETCHMAIL_IMAGE_PATH}" -ExecStop=/usr/bin/podman stop fetchmail -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${FETCHMAILRC}:/etc/fetchmailrc:ro -e POLLING_INTERVAL=${POLLING_INTERVAL} -e FETCHALL=${FETCHALL} -e SILENT=${SILENT} -e SMTP_HOSTS=${SMTP_HOSTS} -e DEBUG=${DEBUG} -e TZ=${TZ} --name fetchmail ${FETCHMAIL_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-haproxy.service new/containers-systemd-0.0+git20210222.f3de7fa/container-haproxy.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-haproxy.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-haproxy.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,21 +1,23 @@ [Unit] Description=openSUSE haproxy container Documentation=https://en.opensuse.org/Portal:Container/Image/haproxy -After=network-online.target container-bind.service +After=network-online.target local-fs.target firewalld.service container-bind.service Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-haproxy EnvironmentFile=-/etc/default/container-haproxy -ExecStartPre=-/usr/bin/podman stop haproxy -ExecStartPre=-/usr/bin/podman rm haproxy -ExecStartPre=-/usr/bin/podman pull ${DHCPD_IMAGE_PATH} -ExecStart=/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v ${CONFIG_FILE}:/etc/haproxy/haproxy.cfg:ro --net=host --name haproxy ${HAPROXY_IMAGE_PATH} -ExecStop=/usr/bin/podman stop haproxy -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${CONFIG_FILE}:/etc/haproxy/haproxy.cfg:ro --net=host --name haproxy ${HAPROXY_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-mariadb.service new/containers-systemd-0.0+git20210222.f3de7fa/container-mariadb.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-mariadb.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-mariadb.service 2021-02-22 15:38:35.000000000 +0100 @@ -5,18 +5,20 @@ Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-mariadb EnvironmentFile=-/etc/default/container-mariadb ExecStartPre=-/usr/bin/mkdir -p ${DATA_DIR} -ExecStartPre=-/usr/bin/podman stop mariadb -ExecStartPre=-/usr/bin/podman rm mariadb -ExecStartPre=-/usr/bin/podman pull ${MARIADB_IMAGE_PATH} -ExecStart=/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v ${DATA_DIR}:/var/lib/mysql -v ${SECRETS_DIR}:/etc/mariadb-secrets -p 3306:3306 --env MYSQL_ROOT_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_ROOT_PASSWORD --env MYSQL_ROOT_HOST_FILE=/etc/mariadb-secrets/MYSQL_ROOT_HOST --env MYSQL_DATABASE_FILE=/etc/mariadb-secrets/MYSQL_DATABASE --env MYSQL_USER_FILE=/etc/mariadb-secrets/MYSQL_USER --env MYSQL_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_PASSWORD --name mariadb ${MARIADB_IMAGE_PATH} -ExecStop=/usr/bin/podman stop mariadb -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${DATA_DIR}:/var/lib/mysql -v ${SECRETS_DIR}:/etc/mariadb-secrets -p 3306:3306 --env MYSQL_ROOT_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_ROOT_PASSWORD --env MYSQL_ROOT_HOST_FILE=/etc/mariadb-secrets/MYSQL_ROOT_HOST --env MYSQL_DATABASE_FILE=/etc/mariadb-secrets/MYSQL_DATABASE --env MYSQL_USER_FILE=/etc/mariadb-secrets/MYSQL_USER --env MYSQL_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_PASSWORD --name mariadb ${MARIADB_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-minidlna.service new/containers-systemd-0.0+git20210222.f3de7fa/container-minidlna.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-minidlna.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-minidlna.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,22 +1,23 @@ [Unit] Description=openSUSE MiniDLNA container -Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-minidlna-image +Documentation=https://en.opensuse.org/Portal:Container/Image/minidlna After=network-online.target local-fs.target firewalld.service Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-minidlna EnvironmentFile=-/etc/default/container-minidlna -ExecStartPre=-/usr/bin/mkdir -p ${MEDIA_DIR} -ExecStartPre=-/usr/bin/podman stop minidlna -ExecStartPre=-/usr/bin/podman rm minidlna -ExecStartPre=-/usr/bin/podman pull ${MINIDLNA_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} ${MINIDLNA_NET} -v ${MEDIA_DIR}:/media:Z ${MINIDLNA_ENV} -e DEBUG=${DEBUG} --name minidlna ${MINIDLNA_IMAGE_PATH} ${MINIDLNA_OPTS}" -ExecStop=/usr/bin/podman stop minidlna -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} ${MINIDLNA_NET} -v ${MEDIA_DIR}:/media:Z ${MINIDLNA_ENV} -e DEBUG=${DEBUG} --name minidlna ${MINIDLNA_IMAGE_PATH} ${MINIDLNA_OPTS}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-nfs-server.default new/containers-systemd-0.0+git20210222.f3de7fa/container-nfs-server.default --- old/containers-systemd-0.0+git20210205.a4b07b6/container-nfs-server.default 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-nfs-server.default 2021-02-22 15:38:35.000000000 +0100 @@ -11,5 +11,8 @@ # could be added as PODMAN_EXTRA_ARGS. EXPORTS_DIR="/exports" +# Ports which needs to be exported +NFS_SERVER_PORTS="-p 2049:2049" + # Extra arguments for podman to start the container PODMAN_EXTRA_ARGS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-nfs-server.service new/containers-systemd-0.0+git20210222.f3de7fa/container-nfs-server.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-nfs-server.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-nfs-server.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,19 +1,21 @@ [Unit] Description=openSUSE NFS Server container -Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-nfs-server-image +Documentation=https://en.opensuse.org/Portal:Container/Image/nfs-server After=network-online.target local-fs.target firewalld.service Wants=network-online.target [Service] Environment=PODMAN_SYSTEMD_UNIT=%n -Restart=on-abnormal +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-nfs-server EnvironmentFile=-/etc/default/container-nfs-server ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id -ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -p 2049:2049 --privileged -v ${EXPORTS_FILE}:/etc/exports -v ${EXPORTS_DIR}:${EXPORTS_DIR} --name nfs-server ${NFS_SERVER_IMAGE_PATH}" +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} ${NFS_SERVER_PORTS} --privileged -v ${EXPORTS_FILE}:/etc/exports -v ${EXPORTS_DIR}:${EXPORTS_DIR} --name nfs-server ${NFS_SERVER_IMAGE_PATH}" ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id -KillMode=none Type=forking PIDFile=%t/%n.pid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-nginx.default new/containers-systemd-0.0+git20210222.f3de7fa/container-nginx.default --- old/containers-systemd-0.0+git20210205.a4b07b6/container-nginx.default 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-nginx.default 2021-02-22 15:38:35.000000000 +0100 @@ -7,6 +7,8 @@ # Name of the path where the configuration is stored NGINX_CFG="/srv/nginx/etc" - # Name of the path where the web pages are stored HTDOCS_DIR="/srv/nginx/htdocs" + +# Ports which needs to be exported +NGINX_PORTS="-p 80:80/tcp -p 443:443/tcp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-nginx.service new/containers-systemd-0.0+git20210222.f3de7fa/container-nginx.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-nginx.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-nginx.service 2021-02-22 15:38:35.000000000 +0100 @@ -5,18 +5,21 @@ Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-nginx EnvironmentFile=-/etc/default/container-nginx ExecStartPre=-/usr/bin/mkdir -p ${NGINX_CFG} ${HTDOCS_DIR} -ExecStartPre=-/usr/bin/podman stop nginx -ExecStartPre=-/usr/bin/podman rm nginx -ExecStartPre=-/usr/bin/podman pull ${NGINX_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v ${NGINX_CFG}:/etc/nginx -v ${HTDOCS_DIR}:/srv/www/htdocs -p 80:80/tcp -p 443:443/tcp --name nginx ${NGINX_IMAGE_PATH}" -ExecStop=/usr/bin/podman stop nginx -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile +%t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${NGINX_CFG}:/etc/nginx -v ${HTDOCS_DIR}:/srv/www/htdocs ${NGINX_PORTS} --name nginx ${NGINX_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-openldap.service new/containers-systemd-0.0+git20210222.f3de7fa/container-openldap.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-openldap.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-openldap.service 2021-02-22 15:38:35.000000000 +0100 @@ -5,18 +5,20 @@ Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-openldap EnvironmentFile=-/etc/default/container-openldap ExecStartPre=-/usr/bin/mkdir -p ${LDAP_DB_DIR} ${LDAP_ETC_DIR} ${LDAP_CERTS_DIR} -ExecStartPre=-/usr/bin/podman stop openldap -ExecStartPre=-/usr/bin/podman rm openldap -ExecStartPre=-/usr/bin/podman pull ${OPENLDAP_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${LDAP_DB_DIR}:/var/lib/ldap:Z -v ${LDAP_ETC_DIR}:/etc/openldap/slapd.d:Z -v ${SECRETS_DIR}:/etc/openldap-secrets:Z -v ${LDAP_CERTS_DIR}:/etc/openldap/certs:z ${LDAP_PORTS} -e LDAP_ADMIN_PASSWORD_FILE=${LDAP_ADMIN_PASSWORD_FILE} -e LDAP_CONFIG_PASSWORD_FILE=${LDAP_CONFIG_PASSWORD_FILE} -e MAIL_ACCOUNT_READER_PASSWORD_FILE=${MAIL_ACCOUNT_READER_PASSWORD_FILE} -e LDAP_DOMAIN=${LDAP_DOMAIN} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_ORGANIZATION=${LDAP_ORGANIZATION} -e LDAP_SEED_LDIF_PATH=${LDAP_SEED_LDIF_PATH} -e LDAP_SEED_SCHEMA_PATH=${LDAP_SEED_SCHEMA_PATH} -e LDAP_TLS=${LDAP_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e LDAP_TLS_CA_KEY=${LDAP_TLS_CA_KEY} -e LDAP_TLS_CRT=${LDAP_TLS_CRT} -e LDAP_TLS_KEY=${LDAP_TLS_KEY} -e LDAP_TLS_ENFORCE=${LDAP_TLS_ENFORCE} -e LDAP_TLS_VERIFY_CLIENT=${LDAP_TLS_VERIFY_CLIENT} -e LDAP_NOFILE=${LDAP_NOFILE} -e LDAP_UID=${LDAP_UID} -e LDAP_GID=${LDAP_GID} -e SLAPD_LOG_LEVEL=${SLAPD_LOG_LEVEL} -e SETUP_FOR_MAILSERVER=${SETUP_FOR_MAILSERVER} -e DEBUG=${DEBUG} --name openldap ${OPENLDAP_IMAGE_PATH}" -ExecStop=/usr/bin/podman stop openldap -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${LDAP_DB_DIR}:/var/lib/ldap:Z -v ${LDAP_ETC_DIR}:/etc/openldap/slapd.d:Z -v ${SECRETS_DIR}:/etc/openldap-secrets:Z -v ${LDAP_CERTS_DIR}:/etc/openldap/certs:z ${LDAP_PORTS} -e LDAP_ADMIN_PASSWORD_FILE=${LDAP_ADMIN_PASSWORD_FILE} -e LDAP_CONFIG_PASSWORD_FILE=${LDAP_CONFIG_PASSWORD_FILE} -e MAIL_ACCOUNT_READER_PASSWORD_FILE=${MAIL_ACCOUNT_READER_PASSWORD_FILE} -e LDAP_DOMAIN=${LDAP_DOMAIN} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_ORGANIZATION=${LDAP_ORGANIZATION} -e LDAP_SEED_LDIF_PATH=${LDAP_SEED_LDIF_PATH} -e LDAP_SEED_SCHEMA_PATH=${LDAP_SEED_SCHEMA_PATH} -e LDAP_TLS=${LDAP_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e LDAP_TLS_CA_KEY=${LDAP_TLS_CA_KEY} -e LDAP_TLS_CRT=${LDAP_TLS_CRT} -e LDAP_TLS_KEY=${LDAP_TLS_KEY} -e LDAP_TLS_ENFORCE=${LDAP_TLS_ENFORCE} -e LDAP_TLS_VERIFY_CLIENT=${LDAP_TLS_VERIFY_CLIENT} -e LDAP_NOFILE=${LDAP_NOFI LE} -e LDAP_UID=${LDAP_UID} -e LDAP_GID=${LDAP_GID} -e SLAPD_LOG_LEVEL=${SLAPD_LOG_LEVEL} -e SETUP_FOR_MAILSERVER=${SETUP_FOR_MAILSERVER} -e DEBUG=${DEBUG} --name openldap ${OPENLDAP_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-postfix.service new/containers-systemd-0.0+git20210222.f3de7fa/container-postfix.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-postfix.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-postfix.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,22 +1,25 @@ [Unit] Description=openSUSE postfix container -Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-postfix-image +Documentation=https://github.com/thkukuk/containers-mailserver/blob/master/postfix/README.md After=network-online.target container-openldap.service local-fs.target firewalld.service Wants=network-online.target container-openldap.service [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-postfix EnvironmentFile=-/etc/default/container-postfix ExecStartPre=-/usr/bin/mkdir -p ${POSTFIX_SPOOL_DIR} ${POSTFIX_VMAIL_DIR} ${EXTRA_PKI_DIR} -ExecStartPre=-/usr/bin/podman stop postfix -ExecStartPre=-/usr/bin/podman rm postfix -ExecStartPre=-/usr/bin/podman pull ${POSTFIX_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${POSTFIX_SPOOL_DIR}:/var/spool/postfix:Z -v ${POSTFIX_VMAIL_DIR}:/var/spool/vmail:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/postfix-secrets:Z ${POSTFIX_PORTS} -e SERVER_HOSTNAME=${SERVER_HOSTNAME} -e SERVER_DOMAIN=${SERVER_DOMAIN} -e SMTP_TLS_SECURITY_LEVEL=${SMTP_TLS_SECURITY_LEVEL} -e SMTP_RELAYHOST=${SMTP_RELAYHOST} -e SMTP_PORT=${SMTP_PORT} -e NULLCLIENT=${NULLCLIENT} -e SMTP_USERNAME=${SMTP_USERNAME} -e SMTP_PASSWORD_FILE=${SMTP_PASSWORD_FILE} -e SMTP_NETWORKS=${SMTP_NETWORKS} -e MASQUERADE_DOMAINS=${MASQUERADE_DOMAINS} -e MYDESTINATION=${MYDESTINATION} -e SPAMASSASSIN_HOST=${SPAMASSASSIN_HOST} -e LMTP=${LMTP} -e VIRTUAL_MBOX=${VIRTUAL_MBOX} -e VMAIL_UID=${VMAIL_UID} -e VIRTUAL_DOMAINS=${VIRTUAL_DOMAINS} -e VIRTUAL_USERS=${VIRTUAL_USERS} -e USE_LDAP=${USE_LDAP} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_SERVER_URL=${LDAP_SERVER_URL} -e LDAP_BIND_DN=${LDAP_BIND_DN} - e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e TZ=${TZ} -e DEBUG=${DEBUG} --name postfix ${POSTFIX_IMAGE_PATH}" -ExecStop=/usr/bin/podman stop postfix -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v ${POSTFIX_SPOOL_DIR}:/var/spool/postfix:Z -v ${POSTFIX_VMAIL_DIR}:/var/spool/vmail:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/postfix-secrets:Z ${POSTFIX_PORTS} -e SERVER_HOSTNAME=${SERVER_HOSTNAME} -e SERVER_DOMAIN=${SERVER_DOMAIN} -e SMTP_TLS_SECURITY_LEVEL=${SMTP_TLS_SECURITY_LEVEL} -e SMTP_RELAYHOST=${SMTP_RELAYHOST} -e SMTP_PORT=${SMTP_PORT} -e NULLCLIENT=${NULLCLIENT} -e SMTP_USERNAME=${SMTP_USERNAME} -e SMTP_PASSWORD_FILE=${SMTP_PASSWORD_FILE} -e SMTP_NETWORKS=${SMTP_NETWORKS} -e MASQUERADE_DOMAINS=${MASQUERADE_DOMAINS} -e MYDESTINATION=${MYDESTINATION} -e SPAMASSASSIN_HOST=${SPAMASSASSIN_HOST} -e LMTP=${LMTP} -e VIRTUAL_MBOX=${VIRTUAL_MBOX} -e VMAIL_UID=${VMAIL_UID} -e VIRTUAL_DOMAINS=${VIRTUAL_DOMAINS} -e VIRTUAL_USERS=${VIRTUAL_USERS} -e USE_LDAP=${USE_LDAP} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_SERVER_URL= ${LDAP_SERVER_URL} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e TZ=${TZ} -e DEBUG=${DEBUG} --name postfix ${POSTFIX_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid + [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-spamassassin.service new/containers-systemd-0.0+git20210222.f3de7fa/container-spamassassin.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-spamassassin.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-spamassassin.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,22 +1,24 @@ [Unit] Description=openSUSE SpamAssassin container -Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-spamassassin-image +Documentation=https://github.com/thkukuk/containers-mailserver/tree/master/spamassassin After=network-online.target local-fs.target firewalld.service Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-spamassassin EnvironmentFile=-/etc/default/container-spamassassin ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} -ExecStartPre=-/usr/bin/podman stop spamassassin -ExecStartPre=-/usr/bin/podman rm spamassassin -ExecStartPre=-/usr/bin/podman pull ${SPAMASSASSIN_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -p 783:783 -v ${CONFIG_DIR}:/etc/spamassassin -e DEBUG=${DEBUG} -e TZ=${TZ} --name spamassassin ${SPAMASSASSIN_IMAGE_PATH}" -ExecStop=/usr/bin/podman stop spamassassin -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -p 783:783 -v ${CONFIG_DIR}:/etc/spamassassin -e DEBUG=${DEBUG} -e TZ=${TZ} --name spamassassin ${SPAMASSASSIN_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20210205.a4b07b6/container-squid.service new/containers-systemd-0.0+git20210222.f3de7fa/container-squid.service --- old/containers-systemd-0.0+git20210205.a4b07b6/container-squid.service 2021-02-05 11:41:11.000000000 +0100 +++ new/containers-systemd-0.0+git20210222.f3de7fa/container-squid.service 2021-02-22 15:38:35.000000000 +0100 @@ -1,21 +1,23 @@ [Unit] Description=openSUSE squid container Documentation=https://en.opensuse.org/Portal:Container/Image/squid -After=network-online.target +After=network-online.target local-fs.target firewalld.service Wants=network-online.target [Service] -Restart=on-abnormal +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +StartLimitBurst=5 +TimeoutStopSec=70 EnvironmentFile=/usr/etc/default/container-squid EnvironmentFile=-/etc/default/container-squid -ExecStartPre=-/usr/bin/podman stop squid -ExecStartPre=-/usr/bin/podman rm squid -ExecStartPre=-/usr/bin/podman pull ${SQUID_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_SQUID_ARGS} --name squid ${SQUID_IMAGE_PATH}" -ExecStop=/usr/bin/podman stop squid -KillMode=none +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} ${PODMAN_SQUID_ARGS} --name squid ${SQUID_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id Type=forking -PIDFile=/%t/%n-pid +PIDFile=%t/%n.pid [Install] WantedBy=multi-user.target
