diff --git a/cookbooks/colab/templates/00-database.py.erb b/cookbooks/colab/templates/00-database.py.erb new file mode 100644 index 0000000..6e5a4ae --- /dev/null +++ b/cookbooks/colab/templates/00-database.py.erb @@ -0,0 +1,8 @@ +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'HOST': "<%= node['peers']['database'] %>", + 'NAME': 'colab', + 'USER': 'colab' + } +} diff --git a/cookbooks/colab/templates/00-database.yaml.erb b/cookbooks/colab/templates/00-database.yaml.erb deleted file mode 100644 index c6a97d8..0000000 --- a/cookbooks/colab/templates/00-database.yaml.erb +++ /dev/null @@ -1,6 +0,0 @@ -DATABASES: - default: - ENGINE: django.db.backends.postgresql_psycopg2 - NAME: colab - USER: colab - HOST: <%= node['peers']['database'] %> diff --git a/cookbooks/colab/templates/02-logging.py.erb b/cookbooks/colab/templates/02-logging.py.erb new file mode 100644 index 0000000..55c78ae --- /dev/null +++ b/cookbooks/colab/templates/02-logging.py.erb @@ -0,0 +1,26 @@ +LOGGING = { + 'loggers': { + 'revproxy': { + 'handlers': ['file'], + 'level': 'ERROR'}, + 'django': { + 'handlers': ['file'], + 'level': 'DEBUG'}, + }, + 'version': 1, 'formatters': { + 'verbose': { + 'format': '%(asctime)s (%(name)s) %(levelname)s: %(message)s' + } + }, + 'disable_existing_loggers': True, 'handlers': { + 'file': { + 'level': 'DEBUG', + 'interval': 24, + 'backupCount': 7, + 'encoding': 'UTF-8', + 'formatter': 'verbose', + 'class': 'logging.handlers.TimedRotatingFileHandler', + 'filename': '/var/log/colab/colab.log' + } + } +} diff --git a/cookbooks/colab/templates/02-logging.yaml.erb b/cookbooks/colab/templates/02-logging.yaml.erb deleted file mode 100644 index ee082df..0000000 --- a/cookbooks/colab/templates/02-logging.yaml.erb +++ /dev/null @@ -1,39 +0,0 @@ -LOGGING: - version: 1 - disable_existing_loggers: True - - formatters: - verbose: - format: '%(asctime)s (%(name)s) %(levelname)s: %(message)s' - - simple: - format: '[colab-spb] (%(name)s) %(levelname)s: %(message)s' - - handlers: - syslog: - level: WARNING - class: logging.handlers.SysLogHandler - formatter: simple - address: /dev/log - - file: - level: DEBUG - class: logging.handlers.TimedRotatingFileHandler - filename: /var/log/colab/colab.log - interval: 24 # 24 hours - backupCount: 7 # keep last 7 backups - encoding: UTF-8 - formatter: verbose - - loggers: - django: - handlers: - - file - - syslog - level: DEBUG - - revproxy: - handlers: - - file - - syslog - level: ERROR diff --git a/cookbooks/colab/templates/03-sentry.py.erb b/cookbooks/colab/templates/03-sentry.py.erb new file mode 100644 index 0000000..5421839 --- /dev/null +++ b/cookbooks/colab/templates/03-sentry.py.erb @@ -0,0 +1 @@ +RAVEN_DSN = "<%= node['config']['raven_dsn'] %>" diff --git a/cookbooks/colab/templates/03-sentry.yaml.erb b/cookbooks/colab/templates/03-sentry.yaml.erb deleted file mode 100644 index f9d84fa..0000000 --- a/cookbooks/colab/templates/03-sentry.yaml.erb +++ /dev/null @@ -1,2 +0,0 @@ - -RAVEN_DSN: <%= node['config']['raven_dsn'] %> diff --git a/cookbooks/colab/templates/settings.yaml.erb b/cookbooks/colab/templates/settings.yaml.erb deleted file mode 100644 index 16658f1..0000000 --- a/cookbooks/colab/templates/settings.yaml.erb +++ /dev/null @@ -1,47 +0,0 @@ - -## Set to false in production -DEBUG: false -TEMPLATE_DEBUG: false - -## System admins -ADMINS: &admin -<%- node['config']['admins'].each do |admin| %> - - - <%- admin.each do |item| %> - - <%= item %> - <%- end %> -<% end %> - -MANAGERS: *admin - -# general Django settings -DEFAULT_FROM_EMAIL: '<%= node['config']['colab_from_address'] %>' - -# colab-specific -COLAB_FROM_ADDRESS: '<%= node['config']['colab_from_address'] %>' -SERVER_EMAIL: '<%= node['config']['server_email'] %>' - -EMAIL_HOST: localhost -EMAIL_PORT: 25 -EMAIL_SUBJECT_PREFIX: <%= node['config']['email_subject_prefix'] %> - -SECRET_KEY: <%= File.read('/etc/colab/secret.key').strip %> - -SITE_URL: <%= node['config']['site_url'] %> -BROWSERID_AUDIENCES: - - <%= node['config']['site_url'].sub('http:', 'https:') %> - - <%= node['config']['site_url'].sub('https:', 'http:') %> - -ALLOWED_HOSTS: - - <%= node['config']['external_hostname'] %> - -## Disable indexing -ROBOTS_NOINDEX: false - -## Disable planet -FEEDZILLA_ENABLED: false - -## Set URL of Colab home -COLAB_HOME_URL: '/social' - -GOOGLE_ANALYTICS_TRACKING_ID: '<%= node['config']['google_analytics_id'] %>' -- libgit2 0.21.2