From abe67ca8d64d73df31e3c8037c1f677b92412b89 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Fri, 1 Aug 2014 16:19:39 -0300 Subject: [PATCH] Fixed colab class parameters. Now accepting hiera --- puppet/hieradata/common.yaml | 3 --- puppet/modules/colab/manifests/init.pp | 7 ++++++- puppet/modules/colab/templates/import_mailman_messages.erb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index c7f7473..0280709 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -11,7 +11,6 @@ nginx::worker_processes: 8 nginx::error_log: '/var/log/nginx/error.log' nginx::access_log: '/var/log/nginx/access.log' -#TODO: test colab::mailman_archive_path: '/mnt/mailman/archives/' colab::mailman_exclude_lists: - saberes-divulgacao @@ -22,5 +21,3 @@ colab::hostnames: - colab.interlegis.leg.br - colab.interlegis.gov.br colab::solr_project_path: '/home/colab/apache-solr-3.6.2/example' - -# Remember to replace the id_rsa and id_rsa.pub on colab/files diff --git a/puppet/modules/colab/manifests/init.pp b/puppet/modules/colab/manifests/init.pp index 3a651b0..01615ae 100644 --- a/puppet/modules/colab/manifests/init.pp +++ b/puppet/modules/colab/manifests/init.pp @@ -1,5 +1,10 @@ -class colab { +class colab ( + $mailman_archive_path = 'default', + $mailman_exclude_lists = [], + $hostnames = [], + $solr_project_path = '', +){ require pip require appdeploy::deps::python diff --git a/puppet/modules/colab/templates/import_mailman_messages.erb b/puppet/modules/colab/templates/import_mailman_messages.erb index 5c8753a..a57d8c9 100644 --- a/puppet/modules/colab/templates/import_mailman_messages.erb +++ b/puppet/modules/colab/templates/import_mailman_messages.erb @@ -1 +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 +* * * * * 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 -- libgit2 0.21.2