diff --git a/modules/ntp b/modules/ntp
index 93da3bd..1f519f7 160000
--- a/modules/ntp
+++ b/modules/ntp
@@ -1 +1 @@
-Subproject commit 93da3bd01a5ae4276eddec15ac615eb4bccc23cf
+Subproject commit 1f519f719552aedc98b6995e42d23201a0286a58
diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index 439463d..13a5bc6 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -75,7 +75,7 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
location => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/',
release => 'jessie',
repos => 'main',
- notify => Exec['apt_update'],
+ notify_update => true,
key => {
'id' => '20B06EE621AB150D40F6079FD76EDC7725E010CF',
'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub'
@@ -106,6 +106,7 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
location => 'http://repo.rhizomatica.org/debian/',
release => 'jessie',
repos => 'main',
+ allow_unsigned => true,
require => File['/etc/apt/apt.conf.d/90unsigned'],
}
diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 0c3fbd9..3cae5d7 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -187,7 +187,8 @@ class rhizo_base {
file { '/home/rhizomatica/bin':
ensure => directory,
source => 'puppet:///modules/rhizo_base/bin',
- recurse => true,
+ source_permissions => use,
+ recurse => remote,
purge => false,
}
@@ -243,7 +244,8 @@ class rhizo_base {
Exec['notify-freeswitch'],
Exec['restart-rapi'],
Exec['restart-smpp'],
- Exec['restart-esme'] ],
+ Exec['restart-esme'],
+ Exec['restart-apache'] ],
}
file { '/var/rhizomatica/bin/get_account_balance.sh':
@@ -320,6 +322,11 @@ class rhizo_base {
refreshonly => true,
}
+ exec { 'restart-apache':
+ command => '/usr/sbin/service apache2 restart',
+ refreshonly => true,
+ }
+
if $operatingsystem == 'Ubuntu' {
file { '/var/lib/locales/supported.d/local':
ensure => present,
diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index 16980f2..7d37ec7 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -59,7 +59,8 @@ class rhizo_base::packages::debian inherits rhizo_base::packages::common {
file { '/etc/php/7.0/apache2/php.ini':
ensure => present,
- source => "puppet:///modules/rhizo_base/php.ini"
+ source => "puppet:///modules/rhizo_base/php.ini",
+ notify => Exec['restart-apache']
}
}
diff --git a/modules/rhizo_base/manifests/runit.pp b/modules/rhizo_base/manifests/runit.pp
index 7cbbe55..d4209e2 100644
--- a/modules/rhizo_base/manifests/runit.pp
+++ b/modules/rhizo_base/manifests/runit.pp
@@ -12,9 +12,10 @@
#
class rhizo_base::runit {
file { '/etc/sv':
- ensure => directory,
- source => 'puppet:///modules/rhizo_base/etc/sv',
- recurse => remote,
+ ensure => directory,
+ source => 'puppet:///modules/rhizo_base/etc/sv',
+ source_permissions => use,
+ recurse => remote,
require => Class['rhizo_base::packages'],
}
diff --git a/modules/rhizo_base/templates/vars.xml.erb b/modules/rhizo_base/templates/vars.xml.erb
index 08d816f..77e02cb 100644
--- a/modules/rhizo_base/templates/vars.xml.erb
+++ b/modules/rhizo_base/templates/vars.xml.erb
@@ -38,7 +38,7 @@
-
+