From a7025244e744e9f6cba3c79306133a70c72d151d Mon Sep 17 00:00:00 2001 From: Mar Alegre Date: Tue, 21 Jul 2020 19:13:47 -0500 Subject: [PATCH] restored cron bugfix, since cron bug seems to still be active --- src/gitea/Containerfile | 8 ++++++++ src/gitea/bugfix/cronfix | 2 ++ src/mailsrv/Containerfile | 8 ++++++++ src/mailsrv/bugfix/cronfix | 2 ++ src/mcbe/assets/bin/mcbe-backup | 2 ++ src/nextcloud/Containerfile | 4 ++++ src/nextcloud/bugfix/cronfix | 2 ++ 7 files changed, 28 insertions(+) create mode 100755 src/gitea/bugfix/cronfix create mode 100755 src/mailsrv/bugfix/cronfix create mode 100755 src/nextcloud/bugfix/cronfix diff --git a/src/gitea/Containerfile b/src/gitea/Containerfile index 37df5ac..32eb3c8 100644 --- a/src/gitea/Containerfile +++ b/src/gitea/Containerfile @@ -80,3 +80,11 @@ COPY assets/gitea.service /etc/systemd/system/ ### COPY assets/crontab /root/ RUN crontab -u gitea /root/crontab + +### +### Bugfix +### + +# bugfix for cron +COPY bugfix/cronfix /root/ +RUN chmod +x /root/cronfix && /root/cronfix diff --git a/src/gitea/bugfix/cronfix b/src/gitea/bugfix/cronfix new file mode 100755 index 0000000..483c9dc --- /dev/null +++ b/src/gitea/bugfix/cronfix @@ -0,0 +1,2 @@ +#!/bin/sh +sed -i '/session required pam_loginuid.so/c\#session required pam_loginuid.so' /etc/pam.d/cron diff --git a/src/mailsrv/Containerfile b/src/mailsrv/Containerfile index 13c4b07..653bbc7 100644 --- a/src/mailsrv/Containerfile +++ b/src/mailsrv/Containerfile @@ -77,3 +77,11 @@ RUN mkdir -p /vol/etc # set /vol/etc as working directory WORKDIR /vol/etc + +### +### Bugfix +### + +# bugfix for cron +COPY bugfix/cronfix /root/ +RUN chmod +x /root/cronfix && /root/cronfix diff --git a/src/mailsrv/bugfix/cronfix b/src/mailsrv/bugfix/cronfix new file mode 100755 index 0000000..483c9dc --- /dev/null +++ b/src/mailsrv/bugfix/cronfix @@ -0,0 +1,2 @@ +#!/bin/sh +sed -i '/session required pam_loginuid.so/c\#session required pam_loginuid.so' /etc/pam.d/cron diff --git a/src/mcbe/assets/bin/mcbe-backup b/src/mcbe/assets/bin/mcbe-backup index 695a6b6..770fc5a 100755 --- a/src/mcbe/assets/bin/mcbe-backup +++ b/src/mcbe/assets/bin/mcbe-backup @@ -76,3 +76,5 @@ done # make sure everything is owned by worlds owner chown -R "$(stat -c %U:%G $worlds_dir)" ./ +# touch backup dir to update its last-edited date +touch ./ diff --git a/src/nextcloud/Containerfile b/src/nextcloud/Containerfile index d5b9cd5..e4e6e91 100644 --- a/src/nextcloud/Containerfile +++ b/src/nextcloud/Containerfile @@ -121,3 +121,7 @@ RUN crontab -u www-data /root/crontab COPY bugfix/redis.service /etc/systemd/system/redis.service COPY bugfix/apache2.override /etc/systemd/system/apache2.service.d/override.conf + +# bugfix for cron +COPY bugfix/cronfix /root/ +RUN chmod +x /root/cronfix && /root/cronfix diff --git a/src/nextcloud/bugfix/cronfix b/src/nextcloud/bugfix/cronfix new file mode 100755 index 0000000..483c9dc --- /dev/null +++ b/src/nextcloud/bugfix/cronfix @@ -0,0 +1,2 @@ +#!/bin/sh +sed -i '/session required pam_loginuid.so/c\#session required pam_loginuid.so' /etc/pam.d/cron