From c6ee4e081c169e1a8ea6992aa36ee578550eb0fa Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 12 Jun 2013 15:09:21 +0300 Subject: [PATCH 1/5] solr: Restart when config changes --- solr/manifests/init.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/solr/manifests/init.pp b/solr/manifests/init.pp index 2f6d15e..2c7ef81 100644 --- a/solr/manifests/init.pp +++ b/solr/manifests/init.pp @@ -76,6 +76,7 @@ class solr { group => "solr", content => template("solr/solr.xml.erb"), require => File["/srv/solr/cores"], + notify => Service["solr"], } file { "/srv/solr/run/start.jar": From 7a335ec6441a50923216ab476d01e5dafc815b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Wed, 12 Jun 2013 15:30:32 +0300 Subject: [PATCH 2/5] flexlm: Hard coded path to lmgrd init script. --- flexlm/files/lmgrd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flexlm/files/lmgrd.init b/flexlm/files/lmgrd.init index a177550..203472f 100644 --- a/flexlm/files/lmgrd.init +++ b/flexlm/files/lmgrd.init @@ -8,7 +8,7 @@ # Source function library. . /etc/init.d/functions -PATH=${PATH}:/usr/local/lib/lmgrd +PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/lib/lmgrd # Determine license id licid=`basename $0 | cut -d '.' -f 2-` From 246816f417f6d2740f1a6ed248825e9e1dea5891 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Thu, 13 Jun 2013 12:28:38 +0300 Subject: [PATCH 3/5] ntpd: Added option to disable strict ACLs for isc-ntpd --- ntpd/manifests/init.pp | 9 +++++++++ ntpd/templates/ntp.conf.erb | 13 +++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ntpd/manifests/init.pp b/ntpd/manifests/init.pp index 8aeee0a..a3a89d6 100644 --- a/ntpd/manifests/init.pp +++ b/ntpd/manifests/init.pp @@ -6,6 +6,11 @@ # Array of NTP servers using [] will disable external servers. # Defaults to pool.ntp.org. # +# $ntp_strict: +# When set to "false", permit time synchronization by default. Required +# for pool.ntp.org or similar server names which have multiple addresses. +# Defaults to "true". +# # $ntp_client_networks: # Array of networks that are allowed to query this server in format # [ "192.168.1.0/255.255.255.0", "192.168.2.0/255.255.255.0", ] or @@ -17,6 +22,10 @@ class ntpd { $ntp_server = ["pool.ntp.org"] } + if !$ntp_strict { + $ntp_strict = "true" + } + case $::operatingsystem { "fedora": { case $::operatingsystemrelease { diff --git a/ntpd/templates/ntp.conf.erb b/ntpd/templates/ntp.conf.erb index 0be9cbf..b4d2fec 100644 --- a/ntpd/templates/ntp.conf.erb +++ b/ntpd/templates/ntp.conf.erb @@ -3,13 +3,20 @@ tinker panic 0 <% end -%> +<% if @ntp_strict == "true" -%> # By default deny everything. restrict -4 default ignore restrict -6 default ignore +<% else -%> +# Permit time synchronization with our time source, but do not +# permit the source to query or modify the service on this system. +restrict -4 default nomodify notrap nopeer noquery +restrict -6 default nomodify notrap nopeer noquery +<% end -%> # Local users may interrogate the ntp server more closely. -restrict 127.0.0.1 -restrict ::1 +restrict 127.0.0.1 nomodify +restrict ::1 nomodify # Drift file. driftfile /var/lib/ntp/ntp.drift @@ -17,7 +24,9 @@ driftfile /var/lib/ntp/ntp.drift # Remote servers. <% @ntp_server.each do |server| -%> server <%= server %> +<% if @ntp_strict == "true" -%> restrict <%= server %> nomodify notrap nopeer noquery +<% end -%> <% end -%> <% if @is_virtual == "false" -%> From 1a6ca4a12343b4b4ea46ddd635a3e3df5c26f0c2 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Thu, 13 Jun 2013 13:05:33 +0300 Subject: [PATCH 4/5] solr: Added setgid to solr datadir permissions --- solr/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/manifests/init.pp b/solr/manifests/init.pp index 2c7ef81..226ef22 100644 --- a/solr/manifests/init.pp +++ b/solr/manifests/init.pp @@ -63,7 +63,7 @@ class solr { "/srv/solr/run/solr-webapp", "/srv/solr/spool", ]: ensure => directory, - mode => "0770", + mode => "2770", owner => "solr", group => "solr", require => File["/srv/solr"], From e1f8215b5050ade8027169bc0ea017eb85ec99ca Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Thu, 13 Jun 2013 13:05:58 +0300 Subject: [PATCH 5/5] abusesa: Fixed package installation in abusesa::search --- abusesa/manifests/init.pp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp index 7accd44..2d68982 100644 --- a/abusesa/manifests/init.pp +++ b/abusesa/manifests/init.pp @@ -118,8 +118,16 @@ class abusesa::search { python::setup::install { "/usr/local/src/abusesa-search": } - package { [ "python-BeautifulSoup", - "python-lxml", ]: + package { "python-BeautifulSoup": + ensure => installed, + name => $::operatingsystem ? { + "debian" => "python-beautifulsoup", + "ubuntu" => "python-beautifulsoup", + default => "python-BeautifulSoup", + } + } + + package { "python-lxml": ensure => installed, }