Merge branch 'master' into ackbar

app.py

@@ -9,6 +9,7 @@ from flask.ext.mail import Mail
 
 import features
 
+from avatars.avatars import Avatar
 from storage import Storage
 
 from avatars.avatars import Avatar
@@ -22,16 +23,50 @@ from data.buildlogs import BuildLogs
 from data.archivedlogs import LogArchive
 from data.userevent import UserEventsBuilderModule
 from data.queue import WorkQueue
-
 from util.analytics import Analytics
 from util.exceptionlog import Sentry
 from util.names import urn_generator
 from util.oauth import GoogleOAuthConfig, GithubOAuthConfig
+from util.signing import Signer
 from util.queuemetrics import QueueMetrics
 from util.config.provider import FileConfigProvider, TestConfigProvider
 from util.config.configutil import generate_secret_key
 from util.config.superusermanager import SuperUserManager
 
+# pylint: disable=invalid-name,too-many-public-methods,too-few-public-methods,too-many-ancestors
+class Config(BaseConfig):
+  """ Flask config enhanced with a `from_yamlfile` method """
+
+  def from_yamlfile(self, config_file):
+    with open(config_file) as f:
+      c = yaml.load(f)
+      if not c:
+        logger.debug('Empty YAML config file')
+        return
+
+      if isinstance(c, str):
+        raise Exception('Invalid YAML config file: ' + str(c))
+
+      for key in c.iterkeys():
+        if key.isupper():
+          self[key] = c[key]
+
+class Flask(BaseFlask):
+  """ Extends the Flask class to implement our custom Config class. """
+
+  def make_config(self, instance_relative=False):
+    root_path = self.instance_path if instance_relative else self.root_path
+    return Config(root_path, self.default_config)
+
+
+OVERRIDE_CONFIG_DIRECTORY = 'conf/stack/'
+OVERRIDE_CONFIG_YAML_FILENAME = 'conf/stack/config.yaml'
+OVERRIDE_CONFIG_PY_FILENAME = 'conf/stack/config.py'
+
+OVERRIDE_CONFIG_KEY = 'QUAY_OVERRIDE_CONFIG'
+LICENSE_FILENAME = 'conf/stack/license.enc'
+>>>>>>> master
+
 
 app = Flask(__name__)
 logger = logging.getLogger(__name__)
@@ -107,6 +142,7 @@ build_logs = BuildLogs(app)
 authentication = UserAuthentication(app)
 userevents = UserEventsBuilderModule(app)
 superusers = SuperUserManager(app)
+signer = Signer(app, OVERRIDE_CONFIG_DIRECTORY)
 queue_metrics = QueueMetrics(app)
 
 tf = app.config['DB_TRANSACTION_FACTORY']