Merge pull request #2134 from FroggyFlox/Issue2127_Source_upstream_sm…

…b-service

Source package default smb.service in "Built on openSUSE" variants. Fixes #2127

src/rockstor/smart_manager/views/samba_service.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2012-2013 RockStor, Inc. <http://rockstor.com>
+Copyright (c) 2012-2020 RockStor, Inc. <http://rockstor.com>
 This file is part of RockStor.
 
 RockStor is free software; you can redistribute it and/or modify
@@ -16,25 +16,28 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import logging
+import re
 import shutil
-from rest_framework.response import Response
-from storageadmin.util import handle_exception
-from system.services import systemctl, service_status
-from system.samba import (update_global_config, restart_samba,
-                          get_global_config)
-from django.db import transaction
+from tempfile import mkstemp
+
 from django.conf import settings
+from django.db import transaction
+from rest_framework.response import Response
+
 from base_service import BaseServiceDetailView
 from smart_manager.models import Service
-from system.osi import md5sum
 from smart_manager.serializers import ServiceStatusSerializer
+from storageadmin.util import handle_exception
+from system.osi import md5sum
+from system.samba import update_global_config, restart_samba, get_global_config
+from system.services import systemctl, service_status
 
-import logging
 logger = logging.getLogger(__name__)
 
 
 class SambaServiceView(BaseServiceDetailView):
-    service_name = 'smb'
+    service_name = "smb"
 
     @transaction.atomic
     def get(self, request, *args, **kwargs):
@@ -52,68 +55,115 @@ def post(self, request, command):
         """
         service = Service.objects.get(name=self.service_name)
 
-        if (command == 'config'):
+        if command == "config":
             try:
-                config = request.data.get('config', {})
+                config = request.data.get("config", {})
                 global_config = {}
-                if 'global_config' in config:
-                    gc_lines = config['global_config'].split('\n')
+                if "global_config" in config:
+                    gc_lines = config["global_config"].split("\n")
                     for l in gc_lines:
-                        gc_param = l.strip().split(' = ')
-                        if (len(gc_param) == 2):
-                            if '=' in gc_param[0]:
+                        gc_param = l.strip().split(" = ")
+                        if len(gc_param) == 2:
+                            if "=" in gc_param[0]:
                                 raise Exception(
-                                    'Syntax error, one param has wrong '
-                                    'spaces around equal signs, '
-                                    'please check syntax of '
-                                    '\'%s\'' % ''.join(gc_param))
-                            global_config[gc_param[0].strip().lower()] = gc_param[1].strip()  # noqa
+                                    "Syntax error, one param has wrong "
+                                    "spaces around equal signs, "
+                                    "please check syntax of "
+                                    "'%s'" % "".join(gc_param)
+                                )
+                            global_config[gc_param[0].strip().lower()] = gc_param[
+                                1
+                            ].strip()  # noqa
                     # #E501 Default set current workgroup to one got via samba
                     # config page
-                    global_config['workgroup'] = config['workgroup']
+                    global_config["workgroup"] = config["workgroup"]
                 else:
                     global_config = config
                 # Check Active Directory config and status if AD configured and
                 # ON set workgroup to AD retrieved workgroup else AD not
                 # running and leave workgroup to one choosen by user
-                adso = Service.objects.get(name='active-directory')
+                adso = Service.objects.get(name="active-directory")
                 adconfig = None
                 adso_status = 1
-                if (adso.config is not None):
+                if adso.config is not None:
                     adconfig = self._get_config(adso)
                     adso_out, adso_err, adso_status = service_status(
-                        'active-directory', adconfig)
+                        "active-directory", adconfig
+                    )
                     if adso_status == 0:
-                        global_config['workgroup'] = adconfig['workgroup']
+                        global_config["workgroup"] = adconfig["workgroup"]
                     else:
                         adconfig = None
 
                 self._save_config(service, global_config)
                 update_global_config(global_config, adconfig)
-                restart_samba(hard=True)
+                _, _, smb_rc = service_status(self.service_name)
+                # Restart samba only if already ON
+                # rc == 0 if service is ON, rc != 0 otherwise
+                if smb_rc == 0:
+                    restart_samba(hard=True)
             except Exception as e:
-                e_msg = ('Samba could not be configured. Try again. '
-                         'Exception: %s' % e.__str__())
+                e_msg = (
+                    "Samba could not be configured. Try again. "
+                    "Exception: %s" % e.__str__()
+                )
                 handle_exception(Exception(e_msg), request)
         else:
             try:
-                if (command == 'stop'):
-                    systemctl('smb', 'disable')
-                    systemctl('nmb', 'disable')
+                if command == "stop":
+                    systemctl("smb", "disable")
+                    systemctl("nmb", "disable")
                 else:
-                    systemd_name = '%s.service' % self.service_name
-                    ss_dest = ('/etc/systemd/system/%s' % systemd_name)
-                    ss_src = ('%s/%s' % (settings.CONFROOT, systemd_name))
-                    sum1 = md5sum(ss_dest)
-                    sum2 = md5sum(ss_src)
-                    if (sum1 != sum2):
-                        shutil.copy(ss_src, ss_dest)
-                    systemctl('smb', 'enable')
-                    systemctl('nmb', 'enable')
-                systemctl('nmb', command)
-                systemctl('smb', command)
+                    systemd_name = "{}.service".format(self.service_name)
+                    distro_id = settings.OS_DISTRO_ID
+                    self._write_smb_service(systemd_name, distro_id)
+                    systemctl("smb", "enable")
+                    systemctl("nmb", "enable")
+                systemctl("nmb", command)
+                systemctl("smb", command)
             except Exception as e:
-                e_msg = ('Failed to %s samba due to a system error: %s'
-                         % (command, e.__str__()))
+                e_msg = "Failed to {} samba due to a system error: {}".format(
+                    command, e.__str__()
+                )
                 handle_exception(Exception(e_msg), request)
         return Response()
+
+    def _write_smb_service(self, systemd_name, distro_id):
+        """
+        Customize smb.service file in a distro-dependent manner.
+        In rockstor-based systems, source from settings.CONFROOT.
+        In opensuse-based systems, source from package default.
+        Check for differences before final copy.
+        :param systemd_name:
+        :param distro_id:
+        :return:
+        """
+        ss_dest = "/etc/systemd/system/{}".format(systemd_name)
+
+        # BEGIN CentOS section
+        if distro_id == "rockstor":
+            ss_src = "{}/{}".format(settings.CONFROOT, systemd_name)
+            sum1 = md5sum(ss_dest)
+            sum2 = md5sum(ss_src)
+            if sum1 != sum2:
+                shutil.copy(ss_src, ss_dest)
+        # END CentOS section
+
+        else:
+            ss_src = "/usr/lib/systemd/system/smb.service"
+            # Customize package's default
+            fo, npath = mkstemp()
+            with open(ss_src) as ino, open(npath, "w") as tfo:
+                for l in ino.readlines():
+                    if re.match("After=", l) is not None:
+                        tfo.write(
+                            "{} {}\n".format(l.strip(), "rockstor-bootstrap.service")
+                        )
+                    else:
+                        tfo.write(l)
+
+            # Check for diff and then move file from temp to final location
+            sum1 = md5sum(ss_dest)
+            sum2 = md5sum(npath)
+            if sum1 != sum2:
+                shutil.move(npath, ss_dest)