Permissions cleanup and moving settings to be packaged in the RPM.

3 files changed, 21 insertions, 5 deletions

diff --git a/cobbler/config.py b/cobbler/config.py
index cb22b7b..ee41ea5 100644
--- a/cobbler/config.py
+++ b/cobbler/config.py
@@ -59,6 +59,12 @@ class Config:
        self._profiles     = profiles.Profiles(weakref.proxy(self))
        self._systems      = systems.Systems(weakref.proxy(self))
        self._settings     = settings.Settings() # not a true collection
+       self._serialize_graph_classes = [
+          self._distros,
+          self._repos,
+          self._profiles,
+          self._systems
+       ]
        self._graph_classes = [
           self._settings,
           self._distros,
@@ -66,7 +72,6 @@ class Config:
           self._profiles,
           self._systems
        ]
-
        
        self.file_check()
 
@@ -141,7 +146,7 @@ class Config:
        app up to a working state on first run or if files are deleted.  See api.py
        FIXME: will require some tweaks when serializer modes aren't all file based
        """
-       for x in self._graph_classes:
+       for x in self._serialize_graph_classes:
           if not os.path.exists(x.filename()):
               if not serializer.serialize(x):
                   return False
@@ -152,7 +157,7 @@ class Config:
        """
        Save the object hierarchy to disk, using the filenames referenced in each object.
        """
-       for x in self._graph_classes:
+       for x in self._serialize_graph_classes:
           if not serializer.serialize(x):
               return False
        return True
diff --git a/cobbler/settings.py b/cobbler/settings.py
index 3356bbd..f36b654 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -18,6 +18,9 @@ from rhpl.translate import _, N_, textdomain, utf8
 
 TESTMODE = False
 
+# defaults is to be used if the config file doesn't contain the value
+# we need.
+
 DEFAULTS = {
     "bootloaders"                 : {
         "standard"                : "/usr/lib/syslinux/pxelinux.0",
@@ -116,3 +119,11 @@ class Settings(serializable.Serializable):
        else:
            raise AttributeError, name
 
+if __name__ == "__main__":
+    # used to save a settings file to /var/lib/cobbler/settings, for purposes of
+    # including a new updated settings file in the RPM without remembering how
+    # to format lots of YAML.
+    import yaml
+    print yaml.dump(DEFAULTS)
+
+ 
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index 1525f4f..58de8e0 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,8 +33,8 @@ VFN=valueForName
 currentTime=time.time
 __CHEETAH_version__ = '2.0rc8'
 __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8)
-__CHEETAH_genTime__ = 1189794092.422076
-__CHEETAH_genTimestamp__ = 'Fri Sep 14 14:21:32 2007'
+__CHEETAH_genTime__ = 1189799645.5265479
+__CHEETAH_genTimestamp__ = 'Fri Sep 14 15:54:05 2007'
 __CHEETAH_src__ = 'webui_templates/master.tmpl'
 __CHEETAH_srcLastModified__ = 'Fri Sep 14 14:19:18 2007'
 __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'