From b80e715c05f973494ba845b8fc659239161c80b8 Mon Sep 17 00:00:00 2001 From: Guto Carvalho Date: Tue, 16 Feb 2016 17:52:37 -0200 Subject: [PATCH] Ajustes no solar para tratamento de dominio na criacao dos indices --- files/solr/cria_indices.sh | 9 --------- manifests/init.pp | 5 ++++- manifests/solr.pp | 14 ++++++++------ 3 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 files/solr/cria_indices.sh diff --git a/files/solr/cria_indices.sh b/files/solr/cria_indices.sh deleted file mode 100644 index 51cb266..0000000 --- a/files/solr/cria_indices.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -/usr/bin/curl "http://sei.funai.gov.br:8080/solr/admin/cores?action=CREATE&name=sei-protocolos&instanceDir=/opt/solr/indices/sei-protocolos&config=sei-protocolos-config.xml&schema=sei-protocolos-schema.xml&dataDir=/opt/solr/indices/sei-protocolos/conteudo" - -/usr/bin/curl "http://sei.funai.gov.br:8080/solr/admin/cores?action=CREATE&name=sei-bases-conhecimento&instanceDir=/opt/solr/indices/sei-bases-conhecimento&config=sei-bases-conhecimento-config.xml&schema=sei-bases-conhecimento-schema.xml&dataDir=/opt/solr/indices/sei-bases-conhecimento/conteudo" - -/usr/bin/curl "http://sei.funai.gov.br:8080/solr/admin/cores?action=CREATE&name=sei-publicacoes&instanceDir=/opt/solr/indices/sei-publicacoes&config=sei-publicacoes-config.xml&schema=sei-publicacoes-schema.xml&dataDir=/opt/solr/indices/sei-publicacoes/conteudo" - -/usr/bin/curl "http://sei.funai.gov.br:8080/solr/admin/cores?action=RELOAD" diff --git a/manifests/init.pp b/manifests/init.pp index 19979fd..ebc75d9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -48,7 +48,10 @@ class seiaio ( docroot => $docroot, } - include seiaio::solr + class { 'seiaio::solr': + dominio => $dominio, + } + include seiaio::jodc } diff --git a/manifests/solr.pp b/manifests/solr.pp index 122dc1f..a77bfd6 100644 --- a/manifests/solr.pp +++ b/manifests/solr.pp @@ -1,4 +1,6 @@ -class seiaio::solr { +class seiaio::solr ( + String $dominio, + ) { require seiaio::jdk @@ -265,11 +267,11 @@ class seiaio::solr { } file { '/usr/local/bin/solr_cria_indices.sh': - ensure => 'file', - mode => '0750', - owner => 'root', - group => 'root', - source => 'puppet:///modules/seiaio/solr/cria_indices.sh', + ensure => 'file', + mode => '0750', + owner => 'root', + group => 'root', + content => template('seiaio/solr/cria_indices.sh.erb'), } file { '/usr/local/etc/solr_status': -- libgit2 0.21.2