Merge branch 'colab_config'

This merge makes the necessary changes for updated colab packages for SPB release 4

Merge branch 'colab_config'
This merge makes the necessary changes for updated colab packages for SPB release 4
Antonio Terceiro
2 parents c3b1585e edff114b
Showing 17 changed files with 228 additions and 106 deletions Show diff stats
.gitignore
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/00-custom_settings.py.erb
cookbooks/colab/templates/00-database.yaml.erb
cookbooks/colab/templates/01-apps.yaml.erb
cookbooks/colab/templates/01-database.py.erb
cookbooks/colab/templates/02-logging.py.erb
cookbooks/colab/templates/02-logging.yaml.erb
cookbooks/colab/templates/03-sentry.py.erb
cookbooks/colab/templates/03-sentry.yaml.erb
cookbooks/colab/templates/04-memcached.py.erb
cookbooks/colab/templates/05-celery.py.erb
cookbooks/colab/templates/gitlab.py.erb
cookbooks/colab/templates/noosfero.py.erb
cookbooks/colab/templates/raven.py.erb
cookbooks/colab/templates/settings.yaml.erb
cookbooks/colab/templates/spb.py.erb
@@ -12,3 +12,4 @@
 *.swo
 /backups
 /exported_data
+.vagrant
@@ -11,13 +11,12 @@ if node[&#39;platform&#39;] == &#39;centos&#39;
   end
 end
-# FIXME should not be needed; colab should depend on the right version of
-# colab-deps
-package 'colab-deps' do
+package 'colab' do
   action :upgrade
+  notifies :restart, 'service[colab]'
 end
-package 'colab' do
+package 'colab-spb-theme' do
   action :upgrade
   notifies :restart, 'service[colab]'
 end
@@ -44,7 +43,7 @@ execute &#39;secret-key&#39; do
   f = '/etc/colab/secret.key'
   command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"
   not_if { File.exists?(f) }
-  notifies :create, 'template[/etc/colab/settings.yaml]'
+  notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]'
 end
 template '/etc/sysconfig/colab' do
@@ -54,20 +53,21 @@ template &#39;/etc/sysconfig/colab&#39; do
   notifies :restart, 'service[colab]'
 end
-template '/etc/colab/settings.yaml' do
+template '/etc/colab/settings.d/00-custom_settings.py' do
   owner  'root'
   group  'colab'
   mode   0640
   notifies :restart, 'service[colab]'
 end
-template '/etc/colab/settings.d/00-database.yaml' do
+template '/etc/colab/settings.d/01-database.py' do
   owner  'root'
   group  'colab'
   mode   0640
   notifies :restart, 'service[colab]'
 end
+# Creating a gitlab admin user
 template '/tmp/admin-gitlab.json' do
   password = SecureRandom.random_number.to_s
@@ -96,12 +96,40 @@ execute &#39;create-admin-token-gitlab&#39; do
   user 'git'
 end
-template '/etc/colab/settings.d/01-apps.yaml' do
+# Adding settings.d files
+template '/etc/colab/settings.d/02-logging.py' do
   owner  'root'
   group  'colab'
   mode   0640
   notifies :restart, 'service[colab]'
+end
+template '/etc/colab/settings.d/03-sentry.py' do
+  owner  'root'
+  group  'colab'
+  mode   0640
+  notifies :restart, 'service[colab]'
+end
+
+template '/etc/colab/settings.d/04-memcached.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+  notifies :restart, 'service[colab]'
+end
+
+template '/etc/colab/settings.d/05-celery.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+  notifies :restart, 'service[colab]'
+end
+
+# Adding plugins for colab
+template '/etc/colab/plugins.d/gitlab.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
   get_private_token =  lambda do
     Dir.chdir '/usr/lib/gitlab' do
       `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip
@@ -111,22 +139,34 @@ template &#39;/etc/colab/settings.d/01-apps.yaml&#39; do
   variables(
     :get_private_token => get_private_token
   )
+
+  notifies :restart, 'service[colab]'
 end
-template '/etc/colab/settings.d/02-logging.yaml' do
-  owner  'root'
-  group  'colab'
-  mode   0640
+template '/etc/colab/plugins.d/noosfero.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
   notifies :restart, 'service[colab]'
 end
-template '/etc/colab/settings.d/03-sentry.yaml' do
-  owner  'root'
-  group  'colab'
-  mode   0640
+template '/etc/colab/plugins.d/spb.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+  notifies :restart, 'service[colab]'
+end
+
+template '/etc/colab/plugins.d/raven.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
   notifies :restart, 'service[colab]'
 end
+execute 'colab-admin migrate'
+
+# Static files
 directory '/var/lib/colab-assets/spb/' do
   owner  'root'
   group  'root'
@@ -0,0 +1,37 @@
+## Set to false in production
+DEBUG = False
+TEMPLATE_DEBUG = False
+
+## System admins
+ADMINS = [
+<%- node['config']['admins'].each do |admin| %>
+  ("<%= admin[0] %>", "<%= admin[1] %>"),
+<% end %>
+]
+
+MANAGERS = ADMINS
+
+# 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'] %>"
+
+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
+
+## Disable indexing
+ROBOTS_NOINDEX = False
+
+## Set URL of Colab home
+COLAB_HOME_URL = '/social'
+
+GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
@@ -1,6 +0,0 @@
-DATABASES:
-  default:
-    ENGINE: django.db.backends.postgresql_psycopg2
-    NAME: colab
-    USER: colab
-    HOST: <%= node['peers']['database'] %>
@@ -1,7 +0,0 @@
-### Colab proxied apps
-PROXIED_APPS:
-  gitlab:
-    upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
-    private_token: '<%= @get_private_token.call %>'
-  noosfero:
-    upstream: 'http://<%= node['peers']['social'] %>:80/social/'
@@ -0,0 +1,8 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'HOST': "<%= node['peers']['database'] %>",
+        'NAME': 'colab',
+        'USER': 'colab'
+    }
+}
@@ -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'
+        }
+    }
+}
@@ -1,28 +0,0 @@
-LOGGING:
-  version: 1
-  disable_existing_loggers: True
-
-  formatters:
-    verbose:
-      format: '%(asctime)s (%(name)s) %(levelname)s: %(message)s'
-
-  handlers:
-    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
-      level: DEBUG
-
-    revproxy:
-      handlers:
-        - file
-      level: ERROR
@@ -0,0 +1 @@
+RAVEN_DSN = "<%= node['config']['raven_dsn'] %>"
@@ -1,2 +0,0 @@
-
-RAVEN_DSN: <%= node['config']['raven_dsn'] %>
@@ -0,0 +1,6 @@
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+    }
+}
@@ -0,0 +1,2 @@
+BROKER_URL = 'redis://<%= node['peers']['database'] %>:6379/0'
+CELERY_RESULT_BACKEND = 'redis://<%= node['peers']['database'] %>:6379/0'
@@ -0,0 +1,39 @@
+from django.utils.translation import ugettext_lazy as _
+from colab.plugins.utils.menu import colab_url_factory
+
+# Gitlab plugin - Put this in plugins.d/gitlab.py to actiate ##
+
+name = 'colab_gitlab'
+verbose_name = 'Gitlab Plugin'
+
+upstream = 'http://<%= node['peers']['integration'] %>:81/gitlab/'
+
+private_token = '<%= @get_private_token.call %>'
+
+urls = {
+    'include': 'colab_gitlab.urls',
+    'namespace': 'gitlab',  # TODO: do not allow to change namespace
+    'prefix': '^gitlab/',
+}
+
+menu_title = _('Development')
+
+url = colab_url_factory('gitlab')
+
+menu_urls = (
+    url(display=_('Public Projects'), viewname='gitlab',
+        kwargs={'path': 'public/projects'}, auth=False),
+    url(display=_('Profile'), viewname='gitlab',
+        kwargs={'path': 'profile'}, auth=True),
+    url(display=_('New Project'), viewname='gitlab',
+        kwargs={'path': 'projects/new'}, auth=True),
+    url(display=_('Projects'), viewname='gitlab',
+        kwargs={'path': 'dashboard/projects'}, auth=True),
+    url(display=_('Groups'), viewname='gitlab',
+        kwargs={'path': 'profile/groups'}, auth=True),
+    url(display=_('Issues'), viewname='gitlab',
+        kwargs={'path': 'dashboard/issues'}, auth=True),
+    url(display=_('Merge Requests'), viewname='gitlab',
+        kwargs={'path': 'merge_requests'}, auth=True),
+
+)
@@ -0,0 +1,33 @@
+from django.utils.translation import ugettext_lazy as _
+from colab.plugins.utils.menu import colab_url_factory
+
+# Noosfero plugin - Put this in plugins.d/noosfero.py to actiate ##
+# from django.utils.translation import ugettext_lazy as _
+# from colab.plugins.utils.menu import colab_url_factory
+
+name = 'colab_noosfero'
+verbose_name = 'Noosfero Plugin'
+
+upstream = 'http://<%= node['peers']['social'] %>:80/social/'
+
+urls = {
+    'include': 'colab_noosfero.urls',
+    'namespace': 'noosfero',  # TODO: do not allow to change namespace
+    'prefix': '^social/',
+}
+
+menu_title = _('Social')
+
+url = colab_url_factory('noosfero')
+
+menu_urls = (
+    url(display=_('Users'), viewname='noosfero',
+        kwargs={'path': 'search/people'}, auth=False),
+    url(display=_('Communities'), viewname='noosfero',
+        kwargs={'path': 'search/communities'}, auth=False),
+    url(display=_('Profile'), viewname='noosfero',
+        kwargs={'path': 'profile/~/'}, auth=True),
+    url(display=_('Control Panel'), viewname='noosfero',
+        kwargs={'path': 'myprofile/~/'}, auth=True),
+
+)
@@ -0,0 +1,4 @@
+
+name = "raven.contrib.django.raven_compat"
+
+middlewares = ['raven.contrib.django.raven_compat.middleware.Sentry404CatchMiddleware']
@@ -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'] %>'
@@ -0,0 +1,15 @@
+from django.utils.translation import ugettext_lazy as _
+from colab.plugins.utils.menu import colab_url_factory
+
+name = "colab_spb"
+verbose_name = "SPB Plugin"
+
+middlewares = ['colab_spb.middleware.ForceLangMiddleware']
+
+urls = {
+         "include":"colab_spb.urls",
+         "prefix": '^spb/',
+         "namespace":"colab_spb"
+       }
+
+url = colab_url_factory('colab_spb')
	@@ -12,3 +12,4 @@		@@ -12,3 +12,4 @@
12	*.swo	12	*.swo
13	/backups	13	/backups
14	/exported_data	14	/exported_data
		15	+.vagrant
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+## Set to false in production
	2	+DEBUG = False
	3	+TEMPLATE_DEBUG = False
	4	+
	5	+## System admins
	6	+ADMINS = [
	7	+<%- node['config']['admins'].each do \|admin\| %>
	8	+ ("<%= admin[0] %>", "<%= admin[1] %>"),
	9	+<% end %>
	10	+]
	11	+
	12	+MANAGERS = ADMINS
	13	+
	14	+# general Django settings
	15	+DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
	16	+
	17	+# colab-specific
	18	+COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
	19	+SERVER_EMAIL = '<%= node['config']['server_email'] %>'
	20	+
	21	+EMAIL_HOST = "localhost"
	22	+EMAIL_PORT = 25
	23	+EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
	24	+
	25	+SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
	26	+
	27	+SITE_URL = "<%= node['config']['site_url'] %>"
	28	+
	29	+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
	30	+
	31	+## Disable indexing
	32	+ROBOTS_NOINDEX = False
	33	+
	34	+## Set URL of Colab home
	35	+COLAB_HOME_URL = '/social'
	36	+
	37	+GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
	@@ -1,6 +0,0 @@	@@ -1,6 +0,0 @@
1	-DATABASES:
2	- default:
3	- ENGINE: django.db.backends.postgresql_psycopg2
4	- NAME: colab
5	- USER: colab
6	- HOST: <%= node['peers']['database'] %>
	@@ -1,7 +0,0 @@	@@ -1,7 +0,0 @@
1	-### Colab proxied apps
2	-PROXIED_APPS:
3	- gitlab:
4	- upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
5	- private_token: '<%= @get_private_token.call %>'
6	- noosfero:
7	- upstream: 'http://<%= node['peers']['social'] %>:80/social/'
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+DATABASES = {
	2	+ 'default': {
	3	+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
	4	+ 'HOST': "<%= node['peers']['database'] %>",
	5	+ 'NAME': 'colab',
	6	+ 'USER': 'colab'
	7	+ }
	8	+}
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+LOGGING = {
	2	+ 'loggers': {
	3	+ 'revproxy': {
	4	+ 'handlers': ['file'],
	5	+ 'level': 'ERROR'},
	6	+ 'django': {
	7	+ 'handlers': ['file'],
	8	+ 'level': 'DEBUG'},
	9	+ },
	10	+ 'version': 1, 'formatters': {
	11	+ 'verbose': {
	12	+ 'format': '%(asctime)s (%(name)s) %(levelname)s: %(message)s'
	13	+ }
	14	+ },
	15	+ 'disable_existing_loggers': True, 'handlers': {
	16	+ 'file': {
	17	+ 'level': 'DEBUG',
	18	+ 'interval': 24,
	19	+ 'backupCount': 7,
	20	+ 'encoding': 'UTF-8',
	21	+ 'formatter': 'verbose',
	22	+ 'class': 'logging.handlers.TimedRotatingFileHandler',
	23	+ 'filename': '/var/log/colab/colab.log'
	24	+ }
	25	+ }
	26	+}
	@@ -1,28 +0,0 @@	@@ -1,28 +0,0 @@
1	-LOGGING:
2	- version: 1
3	- disable_existing_loggers: True
4	-
5	- formatters:
6	- verbose:
7	- format: '%(asctime)s (%(name)s) %(levelname)s: %(message)s'
8	-
9	- handlers:
10	- file:
11	- level: DEBUG
12	- class: logging.handlers.TimedRotatingFileHandler
13	- filename: /var/log/colab/colab.log
14	- interval: 24 # 24 hours
15	- backupCount: 7 # keep last 7 backups
16	- encoding: UTF-8
17	- formatter: verbose
18	-
19	- loggers:
20	- django:
21	- handlers:
22	- - file
23	- level: DEBUG
24	-
25	- revproxy:
26	- handlers:
27	- - file
28	- level: ERROR
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+RAVEN_DSN = "<%= node['config']['raven_dsn'] %>"
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-
2	-RAVEN_DSN: <%= node['config']['raven_dsn'] %>
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+CACHES = {
	2	+ 'default': {
	3	+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
	4	+ 'LOCATION': '127.0.0.1:11211',
	5	+ }
	6	+}