Hello community, here is the log from the commit of package containers-systemd for openSUSE:Factory checked in at 2020-06-05 20:02:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old) and /work/SRC/openSUSE:Factory/.containers-systemd.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd" Fri Jun 5 20:02:02 2020 rev:12 rq:810841 version:0.0+git20200602.25da9c0 Changes: -------- --- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes 2020-05-05 18:54:53.397348046 +0200 +++ /work/SRC/openSUSE:Factory/.containers-systemd.new.3606/containers-systemd.changes 2020-06-05 20:02:24.520372503 +0200 @@ -1,0 +2,15 @@ +Tue Jun 02 12:43:51 UTC 2020 - [email protected] + +- Update to version 0.0+git20200602.25da9c0: + * Fix creation of nginx directories + +------------------------------------------------------------------- +Tue Jun 02 12:19:05 UTC 2020 - [email protected] + +- Update to version 0.0+git20200602.570333a: + * Move from sysconfig to /etc/default to seperate defaults from user made + changes (containers-systemd#1) + * Use conmon-pidfile for better systemd integration + (container-registry-systemd#2) + +------------------------------------------------------------------- Old: ---- containers-systemd-0.0+git20200324.5f4ae65.tar.xz New: ---- containers-systemd-0.0+git20200602.25da9c0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containers-systemd.spec ++++++ --- /var/tmp/diff_new_pack.SoWTob/_old 2020-06-05 20:02:25.668376269 +0200 +++ /var/tmp/diff_new_pack.SoWTob/_new 2020-06-05 20:02:25.672376281 +0200 @@ -26,14 +26,13 @@ %endif Name: containers-systemd -Version: 0.0+git20200324.5f4ae65 +Version: 0.0+git20200602.25da9c0 Release: 0 Summary: Systemd service files and config files for openSUSE container License: MIT URL: https://github.com/kubic-project/containers-systemd Source: containers-systemd-%{version}.tar.xz Source1: containers-systemd.rpmlintrc -Requires(post): %fillup_prereq BuildArch: noarch %description @@ -50,10 +49,10 @@ %install mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_unitdir} -mkdir -p %{buildroot}%{_fillupdir} +mkdir -p %{buildroot}%{_distconfdir}/default for i in %{containers}; do mkdir -p %{buildroot}/srv/$i - install -m 644 sysconfig.container-$i %{buildroot}%{_fillupdir}/ + install -m 644 container-$i.default %{buildroot}%{_distconfdir}/default/container-$i install -m 644 container-$i.service %{buildroot}%{_unitdir}/ # create symlink for rccontainer-* ln -s /sbin/service %{buildroot}%{_sbindir}/rccontainer-$i @@ -71,9 +70,6 @@ %service_add_pre %{container_services} %post -for i in %{containers}; do - %{fillup_only -n container-$i} -done %service_add_post %{container_services} %preun @@ -87,21 +83,21 @@ %license LICENSE %doc README.md %{_unitdir}/container-bind.service -%{_fillupdir}/sysconfig.container-bind +%{_distconfdir}/default/container-bind %{_sbindir}/rccontainer-bind %ghost %dir /srv/bind %{_unitdir}/container-dhcp-server.service %{_unitdir}/container-dhcp6-server.service -%{_fillupdir}/sysconfig.container-dhcp-server +%{_distconfdir}/default/container-dhcp-server %{_sbindir}/rccontainer-dhcp-server %{_sbindir}/rccontainer-dhcp6-server %ghost %dir /srv/dhcp-server %{_unitdir}/container-haproxy.service -%{_fillupdir}/sysconfig.container-haproxy +%{_distconfdir}/default/container-haproxy %{_sbindir}/rccontainer-haproxy %ghost %dir /srv/haproxy %{_unitdir}/container-mariadb.service -%{_fillupdir}/sysconfig.container-mariadb +%{_distconfdir}/default/container-mariadb %{_sbindir}/rccontainer-mariadb %ghost %dir /srv/mariadb %dir %attr(0700,root,root) %{_sysconfdir}/mariadb-secrets @@ -111,11 +107,11 @@ %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/mariadb-secrets/MYSQL_USER %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/mariadb-secrets/MYSQL_PASSWORD %{_unitdir}/container-nginx.service -%{_fillupdir}/sysconfig.container-nginx +%{_distconfdir}/default/container-nginx %{_sbindir}/rccontainer-nginx %ghost %dir /srv/nginx %{_unitdir}/container-squid.service -%{_fillupdir}/sysconfig.container-squid +%{_distconfdir}/default/container-squid %{_sbindir}/rccontainer-squid %ghost %dir /srv/squid %{_unitdir}/container-image-prune.service ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.SoWTob/_old 2020-06-05 20:02:25.764376583 +0200 +++ /var/tmp/diff_new_pack.SoWTob/_new 2020-06-05 20:02:25.764376583 +0200 @@ -1,5 +1,5 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kubic-project/containers-systemd.git</param> - <param name="changesrevision">5f4ae650ef35272a2c0f7bc06298a559071075a3</param></service> + <param name="changesrevision">25da9c0a7b741f97a2bac78dfa3891206b26afe0</param></service> </servicedata> \ No newline at end of file ++++++ containers-systemd-0.0+git20200324.5f4ae65.tar.xz -> containers-systemd-0.0+git20200602.25da9c0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-bind.default new/containers-systemd-0.0+git20200602.25da9c0/container-bind.default --- old/containers-systemd-0.0+git20200324.5f4ae65/container-bind.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-bind.default 2020-06-02 14:43:14.000000000 +0200 @@ -0,0 +1,9 @@ +# Variables of this file can be overwritten with +# /etc/default/container-bind + +# Name of the image path to pull the bind image from +BIND_IMAGE_PATH=registry.opensuse.org/opensuse/bind:latest + +# Name of the path where the configuration will be stored +CONFIG_DIR="/srv/bind" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-bind.service new/containers-systemd-0.0+git20200602.25da9c0/container-bind.service --- old/containers-systemd-0.0+git20200324.5f4ae65/container-bind.service 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-bind.service 2020-06-02 14:43:14.000000000 +0200 @@ -4,15 +4,18 @@ After=network-online.target [Service] -TimeoutStartSec=0 -Restart=always -EnvironmentFile=/etc/sysconfig/container-bind +Restart=on-failure +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 --rm -v ${CONFIG_DIR}:/data -p 53:53/tcp -p 53:53/udp --name bind ${BIND_IMAGE_PATH} -ExecStop=/usr/bin/podman stop -t 2 bind +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 +Type=forking +PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-dhcp-server.default new/containers-systemd-0.0+git20200602.25da9c0/container-dhcp-server.default --- old/containers-systemd-0.0+git20200324.5f4ae65/container-dhcp-server.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-dhcp-server.default 2020-06-02 14:43:14.000000000 +0200 @@ -0,0 +1,12 @@ +# Variables of this file can be overwritten with +# /etc/default/container-dhcp-server + +# List of interfaces to listen on (if0 if1 ... ifN) +DHCPD_INTERFACES="" + +# Name of the image path to pull the dhcp-server image from +DHCPD_IMAGE_PATH=registry.opensuse.org/opensuse/dhcp-server:latest + +# Name of the path where the configuration will be stored +CONFIG_DIR="/srv/dhcp-server" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-dhcp-server.service new/containers-systemd-0.0+git20200602.25da9c0/container-dhcp-server.service --- old/containers-systemd-0.0+git20200324.5f4ae65/container-dhcp-server.service 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-dhcp-server.service 2020-06-02 14:43:14.000000000 +0200 @@ -4,15 +4,18 @@ After=network-online.target [Service] -TimeoutStartSec=0 -Restart=always -EnvironmentFile=/etc/sysconfig/container-dhcp-server +Restart=on-failure +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 --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 -t 2 dhcp-server +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 +Type=forking +PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-dhcp6-server.service new/containers-systemd-0.0+git20200602.25da9c0/container-dhcp6-server.service --- old/containers-systemd-0.0+git20200324.5f4ae65/container-dhcp6-server.service 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-dhcp6-server.service 2020-06-02 14:43:14.000000000 +0200 @@ -4,15 +4,18 @@ After=network-online.target [Service] -TimeoutStartSec=0 -Restart=always -EnvironmentFile=/etc/sysconfig/container-dhcp-server +Restart=on-failure +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 --rm -v ${CONFIG_DIR}:/data --net=host --name dhcp-server --env DHCPD_IP_PROTOCOL=6 --env DHCPD_INTERFACES=${DHCPD_INTERFACES} ${DHCPD_IMAGE_PATH} -ExecStop=/usr/bin/podman stop -t 2 dhcp-server +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=6 --env DHCPD_INTERFACES=${DHCPD_INTERFACES} ${DHCPD_IMAGE_PATH} +ExecStop=/usr/bin/podman stop dhcp-server +KillMode=none +Type=forking +PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-haproxy.default new/containers-systemd-0.0+git20200602.25da9c0/container-haproxy.default --- old/containers-systemd-0.0+git20200324.5f4ae65/container-haproxy.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-haproxy.default 2020-06-02 14:43:14.000000000 +0200 @@ -0,0 +1,9 @@ +# Variables of this file can be overwritten with +# /etc/default/container-haproxy + +# Name of the image path to pull the bind image from +HAPROXY_IMAGE_PATH=registry.opensuse.org/opensuse/haproxy:latest + +# Name of the haproxy configuration file +CONFIG_FILE="/srv/haproxy/haproxy.cfg" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-haproxy.service new/containers-systemd-0.0+git20200602.25da9c0/container-haproxy.service --- old/containers-systemd-0.0+git20200324.5f4ae65/container-haproxy.service 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-haproxy.service 2020-06-02 14:43:14.000000000 +0200 @@ -4,14 +4,17 @@ After=network-online.target container-bind.service [Service] -TimeoutStartSec=0 -Restart=always -EnvironmentFile=/etc/sysconfig/container-haproxy +Restart=on-failure +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 --rm -v ${CONFIG_FILE}:/etc/haproxy/haproxy.cfg:ro --net=host --name haproxy ${HAPROXY_IMAGE_PATH} -ExecStop=/usr/bin/podman stop -t 2 haproxy +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 +Type=forking +PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-mariadb.default new/containers-systemd-0.0+git20200602.25da9c0/container-mariadb.default --- old/containers-systemd-0.0+git20200324.5f4ae65/container-mariadb.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-mariadb.default 2020-06-02 14:43:14.000000000 +0200 @@ -0,0 +1,15 @@ +# Variables of this file can be overwritten with +# /etc/default/container-mariadb + +# Name of the image path to pull the mariadb image from +MARIADB_IMAGE_PATH=registry.opensuse.org/opensuse/mariadb:latest + +# Name of the path where the configuration will be stored +DATA_DIR="/srv/mariadb" + +# Name of the path where the files with the passwords for +# MYSQL_ROOT_PASSWORD, MYSQL_ROOT_HOST, MYSQL_DATABASE, +# MYSQL_USER and MYSQL_PASSWORD can be found. The file names +# needs to be the ones of the variable names and should not +# be readable for anybody else. +SECRETS_DIR="/etc/mariadb-secrets" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-mariadb.service new/containers-systemd-0.0+git20200602.25da9c0/container-mariadb.service --- old/containers-systemd-0.0+git20200324.5f4ae65/container-mariadb.service 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-mariadb.service 2020-06-02 14:43:14.000000000 +0200 @@ -4,15 +4,18 @@ After=network-online.target [Service] -TimeoutStartSec=0 -Restart=always -EnvironmentFile=/etc/sysconfig/container-mariadb +Restart=on-failure +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 --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 -t 2 mariadb +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 +Type=forking +PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-nginx.default new/containers-systemd-0.0+git20200602.25da9c0/container-nginx.default --- old/containers-systemd-0.0+git20200324.5f4ae65/container-nginx.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-nginx.default 2020-06-02 14:43:14.000000000 +0200 @@ -0,0 +1,12 @@ +# Variables of this file can be overwritten with +# /etc/default/container-nginx + +# Name of the image path to pull the nginx image from +NGINX_IMAGE_PATH=registry.opensuse.org/opensuse/nginx:latest + +# 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-nginx.service new/containers-systemd-0.0+git20200602.25da9c0/container-nginx.service --- old/containers-systemd-0.0+git20200324.5f4ae65/container-nginx.service 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-nginx.service 2020-06-02 14:43:14.000000000 +0200 @@ -4,15 +4,18 @@ After=network-online.target [Service] -TimeoutStartSec=0 -Restart=always -EnvironmentFile=/etc/sysconfig/container-nginx -ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR} +Restart=on-failure +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 --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 -t 2 nginx +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 +Type=forking +PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-squid.default new/containers-systemd-0.0+git20200602.25da9c0/container-squid.default --- old/containers-systemd-0.0+git20200324.5f4ae65/container-squid.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-squid.default 2020-06-02 14:43:14.000000000 +0200 @@ -0,0 +1,12 @@ +# Variables of this file can be overwritten with +# /etc/default/container-squid + +# Name of the image path to pull the bind image from +SQUID_IMAGE_PATH=registry.opensuse.org/opensuse/squid:latest + +# Extra arguments for podman for the squid container +# Possible additional entries (multiple are possible): +# "-v /srv/squid/squid.cfg:/etc/squid/squid.cfg:ro" +# "-v /srv/squid/cache:/var/cache/squid" +PODMAN_SQUID_ARGS="-p 3128:3128" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/container-squid.service new/containers-systemd-0.0+git20200602.25da9c0/container-squid.service --- old/containers-systemd-0.0+git20200324.5f4ae65/container-squid.service 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/container-squid.service 2020-06-02 14:43:14.000000000 +0200 @@ -4,13 +4,17 @@ After=network-online.target [Service] -TimeoutStartSec=0 -Restart=always -EnvironmentFile=/etc/sysconfig/container-squid +Restart=on-failure +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 --rm ${PODMAN_SQUID_ARGS} --name squid ${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 +Type=forking +PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-bind new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-bind --- old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-bind 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-bind 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -## Path: Container/bind -## Description: Settings for bind container -## Type: string -## Default: "registry.opensuse.org/opensuse/bind:latest" -# -# Name of the image path to pull the bind image from -BIND_IMAGE_PATH=registry.opensuse.org/opensuse/bind:latest - -## Type: string -## Default: "/srv/bind" -# -# Name of the path where the configuration will be stored -CONFIG_DIR="/srv/bind" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-dhcp-server new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-dhcp-server --- old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-dhcp-server 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-dhcp-server 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -## Path: Container/dhcp-server -## Description: Settings for dhcp-server and dhcp6-server container -## Type: string -## Default: "" -# -# List of interfaces to listen on (if0 if1 ... ifN) -DHCPD_INTERFACES="" - -## Type: string -## Default: "registry.opensuse.org/opensuse/dhcp-server:latest" -# -# Name of the image path to pull the dhcp-server image from -DHCPD_IMAGE_PATH=registry.opensuse.org/opensuse/dhcp-server:latest - -## Type: string -## Default: "/srv/dhcp-server" -# -# Name of the path where the configuration will be stored -CONFIG_DIR="/srv/dhcp-server" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-haproxy new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-haproxy --- old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-haproxy 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-haproxy 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -## Path: Container/haproxy -## Description: Settings for haproxy container -## Type: string -## Default: "registry.opensuse.org/opensuse/haproxy:latest" -# -# Name of the image path to pull the bind image from -HAPROXY_IMAGE_PATH=registry.opensuse.org/opensuse/haproxy:latest - -## Type: string -## Default: "/srv/haproxy/haproxy.cfg" -# -# Name of the haproxy configuration file -CONFIG_FILE="/srv/haproxy/haproxy.cfg" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-mariadb new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-mariadb --- old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-mariadb 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-mariadb 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -## Path: Container/mariadb -## Description: Settings for mariadb container -## Type: string -## Default: "registry.opensuse.org/opensuse/mariadb:latest" -# -# Name of the image path to pull the mariadb image from -MARIADB_IMAGE_PATH=registry.opensuse.org/opensuse/mariadb:latest - -## Type: string -## Default: "/srv/mariadb" -# -# Name of the path where the configuration will be stored -DATA_DIR="/srv/mariadb" - -## Type: string -## Default: "/etc/mariadb-secrets" -# -# Name of the path where the files with the passwords for -# MYSQL_ROOT_PASSWORD, MYSQL_ROOT_HOST, MYSQL_DATABASE, -# MYSQL_USER and MYSQL_PASSWORD can be found. The file names -# needs to be the ones of the variable names and should not -# be readable for anybody else. -SECRETS_DIR="/etc/mariadb-secrets" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-nginx new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-nginx --- old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-nginx 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-nginx 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -## Path: Container/nginx -## Description: Settings for nginx container -## Type: string -## Default: "registry.opensuse.org/opensuse/nginx:latest" -# -# Name of the image path to pull the nginx image from -NGINX_IMAGE_PATH=registry.opensuse.org/opensuse/nginx:latest - -## Type: string -## Default: "/srv/nginx/etc" -# -# Name of the path where the configuration is stored -NGINX_CFG="/srv/nginx/etc" - - -## Type: string -## Default: "/srv/nginx/htdocs" -# -# Name of the path where the web pages are stored -HTDOCS_DIR="/srv/nginx/htdocs" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-squid new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-squid --- old/containers-systemd-0.0+git20200324.5f4ae65/sysconfig.container-squid 2020-03-24 11:53:09.000000000 +0100 +++ new/containers-systemd-0.0+git20200602.25da9c0/sysconfig.container-squid 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -## Path: Container/squid -## Description: Settings for squid container -## Type: string -## Default: "registry.opensuse.org/opensuse/squid:latest" -# -# Name of the image path to pull the bind image from -SQUID_IMAGE_PATH=registry.opensuse.org/opensuse/squid:latest - -## Type: string -## Default: "-p 3128:3128" -# -# Extra arguments for podman for the squid container -# Possible additional entries (multiple are possible): -# "-v /srv/squid/squid.cfg:/etc/squid/squid.cfg:ro" -# "-v /srv/squid/cache:/var/cache/squid" -PODMAN_SQUID_ARGS="-p 3128:3128" -
