From 00eff6fa85d9c195f8a5f61bdde832da9a36403e Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 20 Sep 2018 20:46:25 +0200
Subject: [PATCH] Startup and location fixes

---
 ckan-datapusher/lxc/bin/add-ca-cert          | 0
 ckan-datapusher/lxc/run                      | 4 ++--
 cts/lxc/etc/services.d/nginx/run             | 2 +-
 kanboard/lxc/etc/services.d/nginx/run        | 2 +-
 kanboard/lxc/etc/services.d/php-fpm/run      | 2 +-
 openmapkit/lxc/etc/services.d/openmapkit/run | 2 +-
 pandora/lxc/etc/services.d/nginx/run         | 2 +-
 sahana-demo/lxcfile                          | 8 ++++----
 sahana/lxc/etc/services.d/nginx/run          | 2 +-
 sahana/lxc/etc/services.d/uwsgi/run          | 2 +-
 sambro/lxcfile                               | 8 ++++----
 seeddms/lxc/etc/services.d/nginx/run         | 2 +-
 seeddms/lxc/etc/services.d/php-fpm/run       | 2 +-
 ushahidi/lxc/etc/services.d/nginx/run        | 2 +-
 ushahidi/lxc/etc/services.d/php-fpm/run      | 2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)
 mode change 100644 => 100755 ckan-datapusher/lxc/bin/add-ca-cert

diff --git a/ckan-datapusher/lxc/bin/add-ca-cert b/ckan-datapusher/lxc/bin/add-ca-cert
old mode 100644
new mode 100755
diff --git a/ckan-datapusher/lxc/run b/ckan-datapusher/lxc/run
index 2d1d0bd..b6b51f8 100644
--- a/ckan-datapusher/lxc/run
+++ b/ckan-datapusher/lxc/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 
-foreground { /bin/add-ca-cert }
+foreground { add-ca-cert }
 s6-setuidgid ckandp
-/usr/sbin/uwsgi --plugin python --http-socket 0.0.0.0:8080 --wsgi-file /etc/ckan-datapusher/datapusher.wsgi --enable-threads
+uwsgi --plugin python --http-socket 0.0.0.0:8080 --wsgi-file /etc/ckan-datapusher/datapusher.wsgi --enable-threads
diff --git a/cts/lxc/etc/services.d/nginx/run b/cts/lxc/etc/services.d/nginx/run
index d09b7cd..dff57ac 100755
--- a/cts/lxc/etc/services.d/nginx/run
+++ b/cts/lxc/etc/services.d/nginx/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/nginx -g "daemon off;"
+nginx -g "daemon off;"
diff --git a/kanboard/lxc/etc/services.d/nginx/run b/kanboard/lxc/etc/services.d/nginx/run
index d09b7cd..dff57ac 100755
--- a/kanboard/lxc/etc/services.d/nginx/run
+++ b/kanboard/lxc/etc/services.d/nginx/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/nginx -g "daemon off;"
+nginx -g "daemon off;"
diff --git a/kanboard/lxc/etc/services.d/php-fpm/run b/kanboard/lxc/etc/services.d/php-fpm/run
index 852e80e..66fe93f 100755
--- a/kanboard/lxc/etc/services.d/php-fpm/run
+++ b/kanboard/lxc/etc/services.d/php-fpm/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/php-fpm7 -F
+php-fpm7 -F
diff --git a/openmapkit/lxc/etc/services.d/openmapkit/run b/openmapkit/lxc/etc/services.d/openmapkit/run
index 709d1b4..690e20f 100755
--- a/openmapkit/lxc/etc/services.d/openmapkit/run
+++ b/openmapkit/lxc/etc/services.d/openmapkit/run
@@ -3,4 +3,4 @@
 fdmove -c 2 1
 export NODE_ENV production
 s6-setuidgid omk
-/usr/bin/node /srv/openmapkit/server.js
+node /srv/openmapkit/server.js
diff --git a/pandora/lxc/etc/services.d/nginx/run b/pandora/lxc/etc/services.d/nginx/run
index d09b7cd..dff57ac 100755
--- a/pandora/lxc/etc/services.d/nginx/run
+++ b/pandora/lxc/etc/services.d/nginx/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/nginx -g "daemon off;"
+nginx -g "daemon off;"
diff --git a/sahana-demo/lxcfile b/sahana-demo/lxcfile
index 7b4d92c..9877904 100644
--- a/sahana-demo/lxcfile
+++ b/sahana-demo/lxcfile
@@ -4,9 +4,9 @@ LAYER shared/libxml
 LAYER shared/python2
 LAYER sahana/sahana
 
-MOUNT DIR /srv/sahana/conf srv/web2py/applications/eden/models
-MOUNT DIR /srv/sahana/data/default srv/web2py/applications/eden/modules/templates/default
-MOUNT DIR /srv/sahana/data/databases srv/web2py/applications/eden/databases
-MOUNT DIR /srv/sahana/data/uploads srv/web2py/applications/eden/uploads
+MOUNT DIR /srv/sahana-demo/conf srv/web2py/applications/eden/models
+MOUNT DIR /srv/sahana-demo/data/default srv/web2py/applications/eden/modules/templates/default
+MOUNT DIR /srv/sahana-demo/data/databases srv/web2py/applications/eden/databases
+MOUNT DIR /srv/sahana-demo/data/uploads srv/web2py/applications/eden/uploads
 
 CMD s6-svscan /etc/services.d
diff --git a/sahana/lxc/etc/services.d/nginx/run b/sahana/lxc/etc/services.d/nginx/run
index d09b7cd..dff57ac 100755
--- a/sahana/lxc/etc/services.d/nginx/run
+++ b/sahana/lxc/etc/services.d/nginx/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/nginx -g "daemon off;"
+nginx -g "daemon off;"
diff --git a/sahana/lxc/etc/services.d/uwsgi/run b/sahana/lxc/etc/services.d/uwsgi/run
index e5a3e8c..1289260 100755
--- a/sahana/lxc/etc/services.d/uwsgi/run
+++ b/sahana/lxc/etc/services.d/uwsgi/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/uwsgi --ini /etc/uwsgi/uwsgi.conf
+uwsgi --ini /etc/uwsgi/uwsgi.conf
diff --git a/sambro/lxcfile b/sambro/lxcfile
index 24b5f96..71084e1 100644
--- a/sambro/lxcfile
+++ b/sambro/lxcfile
@@ -4,9 +4,9 @@ LAYER shared/libxml
 LAYER shared/python2
 LAYER sahana/sahana
 
-MOUNT DIR /srv/sahana/conf srv/web2py/applications/eden/models
-MOUNT DIR /srv/sahana/data/SAMBRO srv/web2py/applications/eden/modules/templates/SAMBRO
-MOUNT DIR /srv/sahana/data/databases srv/web2py/applications/eden/databases
-MOUNT DIR /srv/sahana/data/uploads srv/web2py/applications/eden/uploads
+MOUNT DIR /srv/sambro/conf srv/web2py/applications/eden/models
+MOUNT DIR /srv/sambro/data/SAMBRO srv/web2py/applications/eden/modules/templates/SAMBRO
+MOUNT DIR /srv/sambro/data/databases srv/web2py/applications/eden/databases
+MOUNT DIR /srv/sambro/data/uploads srv/web2py/applications/eden/uploads
 
 CMD s6-svscan /etc/services.d
diff --git a/seeddms/lxc/etc/services.d/nginx/run b/seeddms/lxc/etc/services.d/nginx/run
index d09b7cd..dff57ac 100755
--- a/seeddms/lxc/etc/services.d/nginx/run
+++ b/seeddms/lxc/etc/services.d/nginx/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/nginx -g "daemon off;"
+nginx -g "daemon off;"
diff --git a/seeddms/lxc/etc/services.d/php-fpm/run b/seeddms/lxc/etc/services.d/php-fpm/run
index 852e80e..66fe93f 100755
--- a/seeddms/lxc/etc/services.d/php-fpm/run
+++ b/seeddms/lxc/etc/services.d/php-fpm/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/php-fpm7 -F
+php-fpm7 -F
diff --git a/ushahidi/lxc/etc/services.d/nginx/run b/ushahidi/lxc/etc/services.d/nginx/run
index d09b7cd..dff57ac 100755
--- a/ushahidi/lxc/etc/services.d/nginx/run
+++ b/ushahidi/lxc/etc/services.d/nginx/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/nginx -g "daemon off;"
+nginx -g "daemon off;"
diff --git a/ushahidi/lxc/etc/services.d/php-fpm/run b/ushahidi/lxc/etc/services.d/php-fpm/run
index 852e80e..66fe93f 100755
--- a/ushahidi/lxc/etc/services.d/php-fpm/run
+++ b/ushahidi/lxc/etc/services.d/php-fpm/run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-/usr/sbin/php-fpm7 -F
+php-fpm7 -F