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 2022-06-29 16:00:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old) and /work/SRC/openSUSE:Factory/.containers-systemd.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "containers-systemd" Wed Jun 29 16:00:53 2022 rev:29 rq:985537 version:0.0+git20220628.ee9e63c Changes: -------- --- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes 2022-02-03 23:17:10.740329138 +0100 +++ /work/SRC/openSUSE:Factory/.containers-systemd.new.1548/containers-systemd.changes 2022-06-29 16:01:43.632652170 +0200 @@ -1,0 +2,6 @@ +Tue Jun 28 09:16:00 UTC 2022 - kukuk@suse.com + +- Update to version 0.0+git20220628.ee9e63c: + * Add files to renew certificates with certbot + +------------------------------------------------------------------- Old: ---- containers-systemd-0.0+git20220131.79f09c7.tar.xz New: ---- containers-systemd-0.0+git20220628.ee9e63c.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containers-systemd.spec ++++++ --- /var/tmp/diff_new_pack.NkHDrD/_old 2022-06-29 16:01:46.080655429 +0200 +++ /var/tmp/diff_new_pack.NkHDrD/_new 2022-06-29 16:01:46.084655434 +0200 @@ -17,7 +17,7 @@ %define containers bind dhcp-server dovecot fetchmail haproxy mariadb minidlna nfs-server nginx openldap postfix roundcube samba spamassassin squid wsdd -%define container_services container-bind.service container-dhcp-server.service container-dhcp6-server.service container-dovecot.service container-fetchmail.service container-haproxy.service container-mariadb.service container-minidlna.service container-nfs-server.service container-nginx.service container-openldap.service container-postfix.service container-roundcube.service container-samba.service container-spamassassin.service container-squid.service container-wsdd.service container-image-prune.service container-image-prune.timer +%define container_services container-bind.service container-dhcp-server.service container-dhcp6-server.service container-dovecot.service container-fetchmail.service container-haproxy.service container-mariadb.service container-minidlna.service container-nfs-server.service container-nginx.service container-openldap.service container-postfix.service container-roundcube.service container-samba.service container-spamassassin.service container-squid.service container-wsdd.service container-image-prune.service container-image-prune.timer container-certbot-renew.service container-certbot-renew.timer %if %{undefined service_del_postun_without_restart} %define service_del_postun_without_restart() \ @@ -26,11 +26,11 @@ %endif Name: containers-systemd -Version: 0.0+git20220131.79f09c7 +Version: 0.0+git20220628.ee9e63c Release: 0 Summary: Systemd service files and config files for openSUSE container License: MIT -URL: https://github.com/kubic-project/containers-systemd +URL: https://github.com/openSUSE/containers-systemd Source: containers-systemd-%{version}.tar.xz Source1: containers-systemd.rpmlintrc BuildArch: noarch @@ -59,6 +59,9 @@ # create symlink for rccontainer-* ln -s /sbin/service %{buildroot}%{_sbindir}/rccontainer-$i done +install -m 644 container-certbot.default %{buildroot}%{_distconfdir}/default/container-certbot +install -m 644 container-certbot-renew.service %{buildroot}%{_unitdir}/ +install -m 644 container-certbot-renew.timer %{buildroot}%{_unitdir}/ install -m 644 container-dhcp6-server.service %{buildroot}%{_unitdir}/ ln -s /sbin/service %{buildroot}%{_sbindir}/rccontainer-dhcp6-server install -m 644 container-image-prune.service %{buildroot}%{_unitdir}/ @@ -96,6 +99,9 @@ %{_distconfdir}/default/container-bind %{_sbindir}/rccontainer-bind %ghost %dir /srv/bind +%{_unitdir}/container-certbot-renew.service +%{_unitdir}/container-certbot-renew.timer +%{_distconfdir}/default/container-certbot %{_unitdir}/container-dhcp-server.service %{_unitdir}/container-dhcp6-server.service %{_distconfdir}/default/container-dhcp-server ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NkHDrD/_old 2022-06-29 16:01:46.120655482 +0200 +++ /var/tmp/diff_new_pack.NkHDrD/_new 2022-06-29 16:01:46.124655487 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="version">0.0</param> <param name="versionformat">0.0+git%cd.%h</param> - <param name="url">git://github.com/kubic-project/containers-systemd.git</param> + <param name="url">https://github.com/openSUSE/containers-systemd.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.NkHDrD/_old 2022-06-29 16:01:46.144655514 +0200 +++ /var/tmp/diff_new_pack.NkHDrD/_new 2022-06-29 16:01:46.148655519 +0200 @@ -1,6 +1,7 @@ <servicedata> <service name="tar_scm"> - <param name="url">git://github.com/kubic-project/containers-systemd.git</param> - <param name="changesrevision">79f09c7789d41b4f94fe10ed859fd8a5c885b2d1</param></service> + <param name="url">https://github.com/openSUSE/containers-systemd.git</param> + <param name="changesrevision">ee9e63cfe22480abcec46f37d7c181a8ee874119</param></service> </servicedata> +(No newline at EOF) ++++++ containers-systemd-0.0+git20220131.79f09c7.tar.xz -> containers-systemd-0.0+git20220628.ee9e63c.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20220131.79f09c7/container-certbot-renew.service new/containers-systemd-0.0+git20220628.ee9e63c/container-certbot-renew.service --- old/containers-systemd-0.0+git20220131.79f09c7/container-certbot-renew.service 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20220628.ee9e63c/container-certbot-renew.service 2022-06-28 11:12:23.000000000 +0200 @@ -0,0 +1,23 @@ +[Unit] +Description=Renew certificates with certbot container +Documentation=https://eff-certbot.readthedocs.io/en/stable/install.html#running-with-docke... +After=network-online.target local-fs.target firewalld.service +Wants=network-online.target +StartLimitIntervalSec=40 +StartLimitBurst=5 + +[Service] +Environment=PODMAN_SYSTEMD_UNIT=%n +Restart=on-failure +RestartSec=1s +TimeoutStopSec=70 +EnvironmentFile=-/usr/etc/default/container-certbot +EnvironmentFile=-/etc/default/container-certbot +ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id +ExecStartPre=-/usr/bin/podman pull ${CERTBOT_IMAGE_PATH} +ExecStartPre=-mkdir -p $CONFIG_DIR $VAR_DIR $LOG_DIR +ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile %t/%n.ctr-id --cgroups=no-conmon --sdnotify=conmon --replace -d --rm $PODMAN_EXTRA_ARGS -v ${CONFIG_DIR}:/etc/letsencrypt:z -v ${VAR_DIR}:/var/lib/letsencrypt:z -v ${LOG_DIR}:/var/log/letsencrypt:z $CERTBOT_PORTS --name certbot ${CERTBOT_IMAGE_PATH} renew --standalone +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=notify +NotifyAccess=all diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20220131.79f09c7/container-certbot-renew.timer new/containers-systemd-0.0+git20220628.ee9e63c/container-certbot-renew.timer --- old/containers-systemd-0.0+git20220131.79f09c7/container-certbot-renew.timer 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20220628.ee9e63c/container-certbot-renew.timer 2022-06-28 11:12:23.000000000 +0200 @@ -0,0 +1,13 @@ +[Unit] +Description=Timer to renew certificates with certbot container +Documentation=https://eff-certbot.readthedocs.io/en/stable/install.html#running-with-docke... +After=local-fs.target + +[Timer] +OnCalendar=daily +AccuracySec=1m +RandomizedDelaySec=2h +Persistent=true + +[Install] +WantedBy=timers.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20220131.79f09c7/container-certbot.default new/containers-systemd-0.0+git20220628.ee9e63c/container-certbot.default --- old/containers-systemd-0.0+git20220131.79f09c7/container-certbot.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20220628.ee9e63c/container-certbot.default 2022-06-28 11:12:23.000000000 +0200 @@ -0,0 +1,20 @@ +# Variables of this file can be overwritten with +# /etc/default/container-certbot + +# Name of the image path to pull the wsdd image from +CERTBOT_IMAGE_PATH=certbot/certbot:latest + +# Name of the path where the configuration will be stored +CONFIG_DIR="/srv/certbot/etc" + +# Name of the path which certbot uses as /var/lib/certbot +VAR_DIR="/srv/certbot/var" + +# Name of the path which certbot uses as /var/log/certbot +LOG_DIR="/srv/certbot/log" + +# Ports which certbot webserver will use +CERTBOT_PORTS="-p 80:80" + +# Extra arguments for podman to start the container +PODMAN_EXTRA_ARGS="" ++++++ containers-systemd.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.NkHDrD/_old 2022-06-29 16:01:46.240655642 +0200 +++ /var/tmp/diff_new_pack.NkHDrD/_new 2022-06-29 16:01:46.240655642 +0200 @@ -2,7 +2,6 @@ addFilter("zero-length /etc/mariadb-secrets/MYSQL_.*") addFilter("zero-length /etc/openldap-secrets/LDAP_.*") addFilter("zero-length /etc/postfix-secrets/.*") -# We don't install /sbin/service to build the package -addFilter("dangling-symlink /usr/sbin/rccontainer-.*") -addFilter("suse-missing-rclink container-image-prune") +# We don't restart all container only because the package has changed +addFilter("systemd-service-without-service_del_postun")