Merge pull request #2142 from phillxnet/2006_openSUSE_shellinabox

[openSUSE] adapt to shellinabox package differences. Fixes #2006

buildout.cfg

@@ -24,7 +24,6 @@ parts =
 #      postgres-conf
       gunicorn
       nginx-conf
-      shellinabox-conf
       stop-shellinabox
       django-settings-conf
       test-settings-conf
@@ -60,11 +59,6 @@ recipe = collective.recipe.template
 input = ${buildout:directory}/conf/nginx.conf.in
 output = ${buildout:directory}/etc/nginx/nginx.conf
 
-[shellinabox-conf]
-recipe = collective.recipe.template
-input = ${buildout:directory}/conf/shellinaboxd.in
-output = /etc/sysconfig/shellinaboxd
-
 [stop-shellinabox]
 recipe = plone.recipe.command
 command = systemctl stop shellinaboxd

conf/settings.conf.in

@@ -385,12 +385,20 @@ NUT_LISTEN_ON_IP = '0.0.0.0'
 NUT_SYSTEM_SHUTDOWNCMD = '/sbin/shutdown -h +0'
 
 # Shell In A Box base settings
-SHELLINABOX = {
-	'user': 'root',
-	'group': 'root',
-	'port': '4200',
-	'certs': '/var/lib/shellinabox'
-}
+if distro.id() == 'rockstor':
+    SHELLINABOX = {
+        'user': 'shellinabox',
+        'group': 'shellinabox',
+        'port': '4200',
+        'certs': '/var/lib/shellinabox'
+    }
+else:
+    SHELLINABOX = {
+        'user': 'shellinabox',
+        'group': 'shellinabox',
+        'port': '4200',
+        'certs': '/etc/shellinabox/certs'
+    }
 
 UPDATE_CHANNELS = {
 		'stable': {