Changeset 14153 for trunk

Timestamp:

04/24/12 17:27:43 (12 years ago)

Author:

sil

Message:

Moved cmt.conf and logging.conf to the 'etc'-dir and (temporary) hardcoded it in the sources. Have to make this dynamic soon.

Location:

trunk/sara_cmt

Files:

• CHANGES (added)
• MANIFEST.in (modified) (1 diff)
• bin/cmt (modified) (1 diff)
• etc/logging.conf (moved) (moved from trunk/sara_cmt/sara_cmt/logging.conf)
• sara_cmt/logger.py (modified) (1 diff)
• sara_cmt/settings.py (modified) (1 diff)
• setup.py (modified) (3 diffs)

trunk/sara_cmt/MANIFEST.in

@@ -1 @@
-#include AUTHORS
-##include cmt.py
+include AUTHORS CHANGES README
+include bin/cmt
 recursive-include etc *
-#include config/cmt.conf
-include sara_cmt/logging.conf
 #include sara_cmt/apache/django.wsgi
 recursive-include templates/examples header *.cmt
-#exclude sara_cmt/settings_db.py
+#exclude sara_cmt/settings_db.py # only comment out during testing

trunk/sara_cmt/bin/cmt

@@ -79 +79 @@
 
 # Instantiate ConfigParser
-configfile = os.path.join(settings.PROJECT_BASE, '/etc/cmt/cmt.conf')
+#TODO: make this dynamic
+configfile = '/etc/cmt/cmt.conf'
 config_parser = ConfigParser.ConfigParser()
 config_parser.optionxform = lambda x: x

trunk/sara_cmt/sara_cmt/logger.py

@@ -14 +14 @@
     # Check for existence of a global logging object, otherwise make one
     if 'logger' not in __shared_state.keys():
-        logging.config.fileConfig(
-                os.path.join(os.path.dirname(__file__), 'logging.conf'))
+        #TODO: make this dynamic
+        logging.config.fileConfig('/etc/cmt/logging.conf')
         __shared_state['logger'] = logging.getLogger('cli')
 

trunk/sara_cmt/sara_cmt/settings.py

@@ -6 +6 @@
 #
 #   http://docs.djangoproject.com/en/dev/ref/settings/
-
-SARACMT_BASE = os.path.normpath(os.path.dirname(__file__))
-PROJECT_BASE = os.path.normpath(os.path.join(SARACMT_BASE, os.path.pardir))
 
 # Only set CLIENT_ONLY to False on the central CMT-server

trunk/sara_cmt/setup.py

@@ -46 +46 @@
 #
 #    py_modules = ['mod1', 'pkg.mod2'],
-    py_modules = ['bin.cmt'],
+    #py_modules = ['bin.cmt'],
 
 # http://docs.python.org/distutils/setupscript.html#relationships-between-distributions-and-packages
@@ -90 +90 @@
     # NOTE: wildcards aren't accepted here
     data_files = [
-        ('/etc/cmt/', ['etc/cmt.conf']),
+        ('/etc/cmt/', [
+            'etc/cmt.conf',
+            'etc/logging.conf'
+        ]),
         ('/etc/cmt/templates', [
             'templates/examples/base_allnodes.cmt',
@@ -99 +102 @@
             'templates/examples/lisa_allnodes.cmt'
         ]),
-        ('/usr/local/bin/', ['bin/cmt.py']),
+        ('/usr/local/bin/', ['bin/cmt']),
     ]
 )