Commit 2a80d87e868b1acd2cac2f0fa2f820935f0dc5ad
Exists in
master
and in
39 other branches
Merge branch 'update_puppet' of https://github.com/colab-community/colab into update_puppet
Showing
6 changed files
with
55 additions
and
13 deletions
Show diff stats
fabfile.py
| @@ -283,5 +283,35 @@ def solr(port=8983): | @@ -283,5 +283,35 @@ def solr(port=8983): | ||
| 283 | """Start Solr""" | 283 | """Start Solr""" |
| 284 | with cd('~/solr-4.6.1/colab'), settings(user='colab'): | 284 | with cd('~/solr-4.6.1/colab'), settings(user='colab'): |
| 285 | run('java -jar start.jar -Djetty.port={}'.format(port)) | 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 | # Main | 316 | # Main |
| 287 | environment() | 317 | environment() |
puppet/manifests/init.pp
src/colab/custom_settings.py
| @@ -77,13 +77,6 @@ DATABASES = { | @@ -77,13 +77,6 @@ DATABASES = { | ||
| 77 | 'PASSWORD': os.environ.get('COLAB_DEFAULT_DB_PWD'), | 77 | 'PASSWORD': os.environ.get('COLAB_DEFAULT_DB_PWD'), |
| 78 | 'HOST': os.environ.get('COLAB_DEFAULT_DB_HOST'), | 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 | CACHES = { | 82 | CACHES = { |
| @@ -262,6 +255,14 @@ MESSAGE_TAGS = { | @@ -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 | ### Feedzilla (planet) | 266 | ### Feedzilla (planet) |
| 266 | from feedzilla.settings import * | 267 | from feedzilla.settings import * |
| 267 | FEEDZILLA_PAGE_SIZE = 5 | 268 | FEEDZILLA_PAGE_SIZE = 5 |
| @@ -286,7 +287,6 @@ BROWSERID_CREATE_USER = False | @@ -286,7 +287,6 @@ BROWSERID_CREATE_USER = False | ||
| 286 | 287 | ||
| 287 | 288 | ||
| 288 | ## Proxy settings | 289 | ## Proxy settings |
| 289 | -COLAB_TRAC_URL = 'localhost:5000/trac/' | ||
| 290 | COLAB_CI_URL = 'localhost:9000/ci/' | 290 | COLAB_CI_URL = 'localhost:9000/ci/' |
| 291 | 291 | ||
| 292 | REVPROXY_ADD_REMOTE_USER = True | 292 | REVPROXY_ADD_REMOTE_USER = True |
src/colab/local_settings-dev.py
| @@ -27,12 +27,12 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind' | @@ -27,12 +27,12 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind' | ||
| 27 | 27 | ||
| 28 | DATABASES['default']['PASSWORD'] = 'colab' | 28 | DATABASES['default']['PASSWORD'] = 'colab' |
| 29 | DATABASES['default']['HOST'] = 'localhost' | 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 | HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/' | 34 | HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/' |
| 34 | 35 | ||
| 35 | -COLAB_TRAC_URL = 'http://localhost:5000/trac/' | ||
| 36 | COLAB_CI_URL = 'http://localhost:8080/ci/' | 36 | COLAB_CI_URL = 'http://localhost:8080/ci/' |
| 37 | COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/' | 37 | COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/' |
| 38 | COLAB_REDMINE_URL = 'http://localhost:9080/redmine/' | 38 | COLAB_REDMINE_URL = 'http://localhost:9080/redmine/' |
| @@ -0,0 +1,12 @@ | @@ -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/' |