Support tower license within the database

With backwards support for the file-based license

awx/main/conf.py

@@ -9,17 +9,24 @@ class TowerConfiguration(object):
 
     # TODO: Caching so we don't have to hit the database every time for settings
     def __getattr__(self, key):
+        settings_manifest = django_settings.TOWER_SETTINGS_MANIFEST
+        if key not in settings_manifest:
+            raise AttributeError("Tower Setting with key '{0}' is not defined in the manifest".format(key))
         ts = TowerSettings.objects.filter(key=key)
         if not ts.exists():
-            return getattr(django_settings, key)
+            try:
+                val_actual = getattr(django_settings, key)
+            except AttributeError:
+                val_actual = settings_manifest[key]['default']
+            return val_actual
         return ts[0].value_converted
 
-    def create(key, value):
+    def __setattr__(self, key, value):
         settings_manifest = django_settings.TOWER_SETTINGS_MANIFEST
         if key not in settings_manifest:
             raise AttributeError("Tower Setting with key '{0}' does not exist".format(key))
         settings_entry = settings_manifest[key]
-        setting_actual = TowerSettings.objects.filter(key=key)
+        settings_actual = TowerSettings.objects.filter(key=key)
         if not settings_actual.exists():
             settings_actual = TowerSettings(key=key,
                                             description=settings_entry['description'],

awx/main/middleware.py

@@ -15,7 +15,7 @@ from django.conf import settings
 
 from awx import __version__ as version
 from awx.main.models import ActivityStream, Instance
-from awx.main.comf import tower_settings
+from awx.main.conf import tower_settings
 from awx.api.authentication import TokenAuthentication
 
 

awx/main/models/configuration.py

@@ -54,6 +54,8 @@ class TowerSettings(CreatedModifiedModel):
             converted_type = [x.strip() for x in self.value.split(',')]
         elif self.value_type == 'bool':
             converted_type = self.value in [True, "true", "True", 1, "1", "yes"]
+        elif self.value_type == 'string':
+            converted_type = self.value
         else:
             t = __builtins__[self.value_type]
             converted_type = t(self.value)