From 22fa90d785ac55c0cd5ba79151b201853b0bdbb5 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 16 Sep 2018 19:59:01 +0200
Subject: [PATCH] Use UID/GID for lxc=attach in cron jobs

---
 ckan/setup/etc/periodic/hourly/ckan        |  5 ++---
 kanboard/setup/etc/periodic/daily/kanboard |  3 +--
 seeddms/setup/etc/periodic/hourly/seeddms  |  4 ++--
 ushahidi/setup/etc/periodic/15min/ushahidi | 11 +++++------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ckan/setup/etc/periodic/hourly/ckan b/ckan/setup/etc/periodic/hourly/ckan
index 3723b25..5c58ed5 100755
--- a/ckan/setup/etc/periodic/hourly/ckan
+++ b/ckan/setup/etc/periodic/hourly/ckan
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# TODO: -u 8003 -g 8003 ?
 if [ -e /run/openrc/started/ckan ]; then
-    lxc-attach ckan -- paster --plugin=ckan tracking update -c /etc/ckan/ckan.ini >/dev/null
-    lxc-attach ckan -- paster --plugin=ckan search-index rebuild -r -c /etc/ckan/ckan.ini >/dev/null
+    lxc-attach -u 8003 -g 8003 ckan -- paster --plugin=ckan tracking update -c /etc/ckan/ckan.ini >/dev/null
+    lxc-attach -u 8003 -g 8003 ckan -- paster --plugin=ckan search-index rebuild -r -c /etc/ckan/ckan.ini >/dev/null
 fi
diff --git a/kanboard/setup/etc/periodic/daily/kanboard b/kanboard/setup/etc/periodic/daily/kanboard
index 27fd889..1c72239 100755
--- a/kanboard/setup/etc/periodic/daily/kanboard
+++ b/kanboard/setup/etc/periodic/daily/kanboard
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# TODO: -u 8009 -g 8009 ?
 if [ -e /run/openrc/started/kanboard ]; then
-    lxc-attach kanboard -- /srv/kanboard/cli cronjob >/dev/null
+    lxc-attach -u 8009 -g 8009 kanboard -- /srv/kanboard/cli cronjob >/dev/null
 fi
diff --git a/seeddms/setup/etc/periodic/hourly/seeddms b/seeddms/setup/etc/periodic/hourly/seeddms
index 65be19f..920a3be 100755
--- a/seeddms/setup/etc/periodic/hourly/seeddms
+++ b/seeddms/setup/etc/periodic/hourly/seeddms
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# TODO: -u 8010 -g 8010 ?
 if [ -e /run/openrc/started/seeddms ]; then
-    lxc-attach seeddms -- sh -c "cd /srv/seeddms/www/utils/; php indexer.php --config ../conf/settings.xml" >/dev/null
+    # TODO: Check why this stopped working after 5.1.7
+    lxc-attach -u 8010 -g 8010 seeddms -- sh -c "cd /srv/seeddms/seeddms/utils; php indexer.php --config /srv/seeddms/conf/settings.xml" >/dev/null
 fi
diff --git a/ushahidi/setup/etc/periodic/15min/ushahidi b/ushahidi/setup/etc/periodic/15min/ushahidi
index 70bed27..5923c71 100755
--- a/ushahidi/setup/etc/periodic/15min/ushahidi
+++ b/ushahidi/setup/etc/periodic/15min/ushahidi
@@ -1,10 +1,9 @@
 #!/bin/sh
 
-# TODO: -u 8014 -g 8014 ?
 if [ -e /run/openrc/started/ushahidi ]; then
-    lxc-attach ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi dataprovider outgoing' >/dev/null
-    lxc-attach ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi dataprovider incoming' >/dev/null
-    lxc-attach ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi savedsearch' >/dev/null
-    lxc-attach ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi notification queue' >/dev/null
-    lxc-attach ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi webhook send' >/dev/null
+    lxc-attach -u 8014 -g 8014 ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi dataprovider outgoing' >/dev/null
+    lxc-attach -u 8014 -g 8014 ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi dataprovider incoming' >/dev/null
+    lxc-attach -u 8014 -g 8014 ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi savedsearch' >/dev/null
+    lxc-attach -u 8014 -g 8014 ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi notification queue' >/dev/null
+    lxc-attach -u 8014 -g 8014 ushahidi -- sh -c 'cd /srv/ushahidi/platform; bin/ushahidi webhook send' >/dev/null
 fi