[dist] fix appliance upstart after switch to systemd

* fix ownership for log and run dirs * fixes for startup ordering of daemons
openSUSE · Nov 14, 2018 · 1f68018 · 1f68018
1 parent 20d062b
commit 1f68018
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/dist/obsstoragesetup b/dist/obsstoragesetup
@@ -461,7 +461,8 @@ case "$1" in
 			[ -d $backenddir/run ] || mkdir -p $backenddir/run
 			[ -d $backenddir/log ] || mkdir -p $backenddir/log
 			# fix ownership
-			chown $bsuser:$bsgroup $backenddir
+			chown $bsuser:$bsgroup $backenddir{,/log,/run}
+			chmod g+w $backenddir{/log,/run}
 		fi
 
 		# offer hook to make random special things in your setup

diff --git a/dist/systemd/obsrepserver.service b/dist/systemd/obsrepserver.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OBS repository server
-After=network.target
+After=network.target obsstoragesetup.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/obs-server

diff --git a/dist/systemd/obsservice.service b/dist/systemd/obsservice.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OBS source service server
-After=network.target
+After=network.target obsstoragesetup.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/obs-server

diff --git a/dist/systemd/obsservicedispatch.service b/dist/systemd/obsservicedispatch.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OBS source service dispatcher
-After=obsstoragesetup.service
+After=obsstoragesetup.service obsservice.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/obs-server

diff --git a/dist/systemd/obssrcserver.service b/dist/systemd/obssrcserver.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OBS source repository server
-After=network.target
+After=network.target obsstoragesetup.service obsservice.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/obs-server