Make custom_key_dir a class parameter and not a global variable; misc database update...

diff --git a/manifests/init.pp b/manifests/init.pp
index f5a3e662d41deea1e0462032375b0556b49330b6..14cdc9c147cf9599ee43f25b4c0a8c4eae2125f5 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,6 +2,13 @@
 # Nodo module.
 #
 
+# Default execution path
+Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" }
+
+# Fileserver backup
+filebucket { server: server => hiera('puppet::daemon::server', "puppet.${::domain}" }
+File { backup => server }
+
 # Import required modules
 import "common"
 import "sshd"

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index af7251f7df98f2b11c8449bdea8f891a564c2330..43d6d4f2cce177de3e6faa7f9762a2bbce605f80 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -60,8 +60,9 @@ class nodo {
   # Apt configuration
   if $use_apt != false {
     class { 'apt':
-      include_src      => hiera('nodo::apt_include_src', false),
+      include_src      => hiera('nodo::apt_include_src',      false),
       use_next_release => hiera('nodo::apt_use_next_release', false),
+      custom_key_dir   => hiera('nodo::apt_custom_key_dir',   'puppet:///modules/site_apt/keys.d')
     }
 
     include apt::unattended_upgrades

diff --git a/manifests/subsystems/database.pp b/manifests/subsystems/database.pp
index d9e379ca1011a7fd92f1d65436df24aab11212e4..5796e9c8ee1712e0a4870d98b0f1af2810478072 100644 (file)
--- a/manifests/subsystems/database.pp
+++ b/manifests/subsystems/database.pp
@@ -31,21 +31,21 @@ class database {
   define instance($password, $ensure = 'present', $privileges = all) {
     include mysql::server
 
-    mysql_database { "$name":
+    mysql_database { "${name}":
       ensure  => $ensure,
       require => Service['mysql'],
     }
 
-    mysql_user { "$name@%":
+    mysql_user { "${name}@%":
       ensure        => $ensure,
       password_hash => mysql_password($password),
-      require       => Mysql_database["$name"],
+      require       => Mysql_database["${name}"],
     }
 
     if $ensure == 'present' {
-      mysql_grant { "$name@%/$name":
+      mysql_grant { "${name}@%/${name}":
         privileges => $privileges,
-        require    => Mysql_user["$name@%"],
+        require    => Mysql_user["${name}@%"],
       }
     }
   }