Merge pull request #1455 from SimonHoenscheid/unique_anchors

Make anchors in defined resources unique

Author: bastelfreak

manifests/server/instance/late_initdb.pp

@@ -38,6 +38,6 @@
       WHERE datname = 'template1'",
     unless  => "SELECT datname FROM pg_database WHERE
       datname = 'template1' AND encoding = pg_char_to_encoding('${encoding}')",
-    before  => Anchor['postgresql::server::service::end'],
+    before  => Anchor["postgresql::server::service::end::${name}"],
   }
 }

manifests/server/instance/service.pp

@@ -25,7 +25,7 @@
   Variant[String[1], Stdlib::Absolutepath]     $psql_path        = $postgresql::server::psql_path,
   Hash                                         $connect_settings = $postgresql::server::default_connect_settings,
 ) {
-  anchor { 'postgresql::server::service::begin': }
+  anchor { "postgresql::server::service::begin::${name}": }
 
   if $service_manage {
     service { 'postgresqld':
@@ -52,11 +52,11 @@
         tries            => 60,
         psql_path        => $psql_path,
         require          => Service['postgresqld'],
-        before           => Anchor['postgresql::server::service::end'],
+        before           => Anchor["postgresql::server::service::end::${name}"],
       }
       Postgresql::Server::Database <| title == $default_database |> -> Postgresql_conn_validator['validate_service_is_running']
     }
   }
 
-  anchor { 'postgresql::server::service::end': }
+  anchor { "postgresql::server::service::end::${name}": }
 }