Merge branch 'update_puppet' of https://github.com/colab-community/colab into update_puppet

Charles Oliveira
2 parents 52976943 ea0609fa
Showing 6 changed files with 55 additions and 13 deletions Show diff stats
fabfile.py
puppet/manifests/init.pp
puppet/manifests/site.pp
src/colab/custom_settings.py
src/colab/local_settings-dev.py
src/colab/trac_settings.py
@@ -283,5 +283,35 @@ def solr(port=8983):
     """Start Solr"""
     with cd('~/solr-4.6.1/colab'), settings(user='colab'):
         run('java -jar start.jar -Djetty.port={}'.format(port))
+
+
+@task
+def rebuild_index(age=None, batch=None):
+    """Rebuild the solr index"""
+    age_arg = ''
+    if age:
+        age_arg = '--age={}'.format(age)
+
+    batch_arg = ''
+    if batch:
+        batch_arg = '--batch-size={}'.format(batch)
+
+    manage('rebuild_index {} {}'.format(age_arg, batch_arg))
+
+
+@task
+def update_index():
+    """Update solr index"""
+    manage('update_index')
+
+
+@task
+def build_schema():
+    """Build solr schema"""
+    solr_schema_file = '~/solr-4.6.1/colab/solr/collection1/conf/schema.xml'
+    manage('build_solr_schema -f {}'.format(solr_schema_file))
+    run(r'sed -i "s/<fields>/<fields>\n<field name=\"_version_\" type=\"long\" indexed=\"true\" stored =\"true\"\/>/" {}'.format(solr_schema_file))
+
+
 # Main
 environment()
@@ -1,2 +0,0 @@
-
-include colab
@@ -0,0 +1,2 @@
+
+include colab
@@ -77,13 +77,6 @@ DATABASES = {
         'PASSWORD': os.environ.get('COLAB_DEFAULT_DB_PWD'),
         'HOST': os.environ.get('COLAB_DEFAULT_DB_HOST'),
     },
-    'trac': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'trac_colab',
-        'USER': 'colab',
-        'PASSWORD': os.environ.get('COLAB_TRAC_DB_PWD'),
-        'HOST': os.environ.get('COLAB_TRAC_DB_HOST'),
-    }
 }
  
 CACHES = {
@@ -262,6 +255,14 @@ MESSAGE_TAGS = {
 }
  
  
+### Trac
+TRAC_ENABLED = False
+
+if TRAC_ENABLED:
+    from trac_settings import *
+    DATABASES['trac'] = TRAC_DATABASE
+
+
 ### Feedzilla  (planet)
 from feedzilla.settings import *
 FEEDZILLA_PAGE_SIZE = 5
@@ -286,7 +287,6 @@ BROWSERID_CREATE_USER = False
  
  
 ## Proxy settings
-COLAB_TRAC_URL = 'localhost:5000/trac/'
 COLAB_CI_URL = 'localhost:9000/ci/'
  
 REVPROXY_ADD_REMOTE_USER = True
@@ -27,12 +27,12 @@ CONVERSEJS_BOSH_SERVICE_URL = &#39;http://localhost:5280/http-bind&#39;
  
 DATABASES['default']['PASSWORD'] = 'colab'
 DATABASES['default']['HOST'] = 'localhost'
-DATABASES['trac']['PASSWORD'] = 'colab'
-DATABASES['trac']['HOST'] = 'localhost'
+if TRAC_ENABLED:
+    DATABASES['trac']['PASSWORD'] = 'colab'
+    DATABASES['trac']['HOST'] = 'localhost'
  
 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
  
-COLAB_TRAC_URL = 'http://localhost:5000/trac/'
 COLAB_CI_URL = 'http://localhost:8080/ci/'
 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
@@ -0,0 +1,12 @@
+import os
+
+
+TRAC_DATABASE = {
+    'ENGINE': 'django.db.backends.postgresql_psycopg2',
+    'NAME': 'trac_colab',
+    'USER': 'colab',
+    'PASSWORD': os.environ.get('COLAB_TRAC_DB_PWD'),
+    'HOST': os.environ.get('COLAB_TRAC_DB_HOST'),
+}
+
+COLAB_TRAC_URL = 'localhost:5000/trac/'
...	...	@@ -283,5 +283,35 @@ def solr(port=8983):
283	283	"""Start Solr"""
284	284	with cd('~/solr-4.6.1/colab'), settings(user='colab'):
285	285	run('java -jar start.jar -Djetty.port={}'.format(port))
	286	+
	287	+
	288	+@task
	289	+def rebuild_index(age=None, batch=None):
	290	+ """Rebuild the solr index"""
	291	+ age_arg = ''
	292	+ if age:
	293	+ age_arg = '--age={}'.format(age)
	294	+
	295	+ batch_arg = ''
	296	+ if batch:
	297	+ batch_arg = '--batch-size={}'.format(batch)
	298	+
	299	+ manage('rebuild_index {} {}'.format(age_arg, batch_arg))
	300	+
	301	+
	302	+@task
	303	+def update_index():
	304	+ """Update solr index"""
	305	+ manage('update_index')
	306	+
	307	+
	308	+@task
	309	+def build_schema():
	310	+ """Build solr schema"""
	311	+ solr_schema_file = '~/solr-4.6.1/colab/solr/collection1/conf/schema.xml'
	312	+ manage('build_solr_schema -f {}'.format(solr_schema_file))
	313	+ run(r'sed -i "s/<fields>/<fields>\n<field name=\"_version_\" type=\"long\" indexed=\"true\" stored =\"true\"\/>/" {}'.format(solr_schema_file))
	314	+
	315	+
286	316	# Main
287	317	environment()
...	...
...	...	@@ -77,13 +77,6 @@ DATABASES = {
77	77	'PASSWORD': os.environ.get('COLAB_DEFAULT_DB_PWD'),
78	78	'HOST': os.environ.get('COLAB_DEFAULT_DB_HOST'),
79	79	},
80		- 'trac': {
81		- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
82		- 'NAME': 'trac_colab',
83		- 'USER': 'colab',
84		- 'PASSWORD': os.environ.get('COLAB_TRAC_DB_PWD'),
85		- 'HOST': os.environ.get('COLAB_TRAC_DB_HOST'),
86		- }
87	80	}
88	81
89	82	CACHES = {
...	...	@@ -262,6 +255,14 @@ MESSAGE_TAGS = {
262	255	}
263	256
264	257
	258	+### Trac
	259	+TRAC_ENABLED = False
	260	+
	261	+if TRAC_ENABLED:
	262	+ from trac_settings import *
	263	+ DATABASES['trac'] = TRAC_DATABASE
	264	+
	265	+
265	266	### Feedzilla (planet)
266	267	from feedzilla.settings import *
267	268	FEEDZILLA_PAGE_SIZE = 5
...	...	@@ -286,7 +287,6 @@ BROWSERID_CREATE_USER = False
286	287
287	288
288	289	## Proxy settings
289		-COLAB_TRAC_URL = 'localhost:5000/trac/'
290	290	COLAB_CI_URL = 'localhost:9000/ci/'
291	291
292	292	REVPROXY_ADD_REMOTE_USER = True
...	...
...	...	@@ -27,12 +27,12 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
27	27
28	28	DATABASES['default']['PASSWORD'] = 'colab'
29	29	DATABASES['default']['HOST'] = 'localhost'
30		-DATABASES['trac']['PASSWORD'] = 'colab'
31		-DATABASES['trac']['HOST'] = 'localhost'
	30	+if TRAC_ENABLED:
	31	+ DATABASES['trac']['PASSWORD'] = 'colab'
	32	+ DATABASES['trac']['HOST'] = 'localhost'
32	33
33	34	HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
34	35
35		-COLAB_TRAC_URL = 'http://localhost:5000/trac/'
36	36	COLAB_CI_URL = 'http://localhost:8080/ci/'
37	37	COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
38	38	COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
...	...
...	...	@@ -0,0 +1,12 @@
	1	+import os
	2	+
	3	+
	4	+TRAC_DATABASE = {
	5	+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
	6	+ 'NAME': 'trac_colab',
	7	+ 'USER': 'colab',
	8	+ 'PASSWORD': os.environ.get('COLAB_TRAC_DB_PWD'),
	9	+ 'HOST': os.environ.get('COLAB_TRAC_DB_HOST'),
	10	+}
	11	+
	12	+COLAB_TRAC_URL = 'localhost:5000/trac/'
...	...