Allow missing rhn.conf file

python/spacewalk/common/rhnConfig.py

@@ -100,6 +100,9 @@ def is_initialized(self):
     def modifiedYN(self):
         """returns last modified time diff if rhn.conf has changed."""
 
+        if not os.path.exists(self.filename):
+            return 0
+
         try:
             si = os.stat(self.filename)
         except OSError:
@@ -142,7 +145,8 @@ def parse(self):
 
         # Now that we parsed the defaults, we parse the multi-key
         # self.filename configuration (ie, /etc/rhn/rhn.conf)
-        self.__parsedConfig = parse_file(self.filename)
+        if os.path.exists(self.filename):
+            self.__parsedConfig = parse_file(self.filename)
 
         # And now generate and cache the current component
         self.__merge()

python/spacewalk/common/rhnLog.py

@@ -100,7 +100,7 @@ def initLOG(log_file="stderr", level=0, component=""):
 
         # fetch uid, gid so we can do a "chown ..."
         with cfg_component(component=None) as CFG:
-            apache_uid, apache_gid = getUidGid(CFG.httpd_user, CFG.httpd_group)
+            apache_uid, apache_gid = getUidGid(CFG.get('httpd_user', 'wwwrun'), CFG.get('httpd_group', 'www'))
 
         try:
             os.makedirs(log_path)
@@ -187,7 +187,7 @@ def __init__(self, log_file, level, component):
             set_close_on_exec(self.fd)
             if newfileYN:
                 with cfg_component(component=None) as CFG:
-                    apache_uid, apache_gid = getUidGid(CFG.httpd_user, CFG.httpd_group)
+                    apache_uid, apache_gid = getUidGid(CFG.get('httpd_user', 'wwwrun'), CFG.get('httpd_group', 'www'))
                 os.chown(self.file, apache_uid, apache_gid)
                 os.chmod(self.file, int('0660', 8))
         except:

python/spacewalk/spacewalk-backend.changes.cbosdo.rhnconfig-nofile

@@ -0,0 +1 @@
+- Accept missing rhn.conf file

python/uyuni/common/fileutils.py

@@ -301,9 +301,9 @@ def createPath(path, user=None, group=None, chmod=int('0755', 8)):
     """
     with cfg_component(component=None) as CFG:
         if user is None:
-            user = CFG.httpd_user
+            user = CFG.get('httpd_user', 'wwwrun')
         if group is None:
-            group = CFG.httpd_group
+            group = CFG.get('httpd_group', 'www')
 
     path = cleanupAbsPath(path)
     if not os.path.exists(path):
@@ -324,7 +324,7 @@ def setPermsPath(path, user=None, group='root', chmod=int('0750', 8)):
     """chown user.group and set permissions to chmod"""
     if user is None:
         with cfg_component(component=None) as CFG:
-            user = CFG.httpd_user
+            user = CFG.get('httpd_user', 'wwwrun')
 
     if not os.path.exists(path):
         raise OSError("*** ERROR: Path doesn't exist (can't set permissions): %s" % path)

python/uyuni/uyuni-common-libs.changes.cbosdo.rhnconfig-nofile

@@ -0,0 +1 @@
+- Accept missing rhn.conf file