Download as
Browse Code »

Commit abe67ca8d64d73df31e3c8037c1f677b92412b89

Authored by Sergio Oliveira
1 parent 867b9cfa
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixed colab class parameters. Now accepting hiera

Showing 3 changed files with 7 additions and 5 deletions   Show diff stats
puppet/hieradata/common.yaml
  Diff comments   View file @abe67ca
@@ -11,7 +11,6 @@ nginx::worker_processes: 8 @@ -11,7 +11,6 @@ nginx::worker_processes: 8
11 nginx::error_log: '/var/log/nginx/error.log' 11 nginx::error_log: '/var/log/nginx/error.log'
12 nginx::access_log: '/var/log/nginx/access.log' 12 nginx::access_log: '/var/log/nginx/access.log'
13 13
14 -#TODO: test  
15 colab::mailman_archive_path: '/mnt/mailman/archives/' 14 colab::mailman_archive_path: '/mnt/mailman/archives/'
16 colab::mailman_exclude_lists: 15 colab::mailman_exclude_lists:
17 - saberes-divulgacao 16 - saberes-divulgacao
@@ -22,5 +21,3 @@ colab::hostnames: @@ -22,5 +21,3 @@ colab::hostnames:
22 - colab.interlegis.leg.br 21 - colab.interlegis.leg.br
23 - colab.interlegis.gov.br 22 - colab.interlegis.gov.br
24 colab::solr_project_path: '/home/colab/apache-solr-3.6.2/example' 23 colab::solr_project_path: '/home/colab/apache-solr-3.6.2/example'
25 -  
26 -# Remember to replace the id_rsa and id_rsa.pub on colab/files  
puppet/modules/colab/manifests/init.pp
  Diff comments   View file @abe67ca
1 1
2 -class colab { 2 +class colab (
  3 + $mailman_archive_path = 'default',
  4 + $mailman_exclude_lists = [],
  5 + $hostnames = [],
  6 + $solr_project_path = '',
  7 +){
3 8
4 require pip 9 require pip
5 require appdeploy::deps::python 10 require appdeploy::deps::python
puppet/modules/colab/templates/import_mailman_messages.erb
  Diff comments   View file @abe67ca
1 -* * * * * colab /home/colab/.virtualenvs/colab/bin/python ~/colab/src/manage.py import_emails --archives_path=<%= scope['colab::mailman_path'] %> <% scope['colab::mailman_exclude_lists'].each do |exclude| %> --exclude-list=<%= exclude %> <% end %> &> /dev/null 1 +* * * * * colab /home/colab/.virtualenvs/colab/bin/python ~/colab/src/manage.py import_emails --archives_path=<%= scope['colab::mailman_archive_path'] %> <% scope['colab::mailman_exclude_lists'].each do |exclude| %>--exclude-list=<%= exclude %> <% end %>&> /dev/null