remove legacy anchor resources

markt-de · Jan 30, 2024 · 69d64d5 · 69d64d5
1 parent 4a8332d
commit 69d64d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 28 deletions.
diff --git a/manifests/instance.pp b/manifests/instance.pp
@@ -520,7 +520,6 @@
         server_host  => $server_host,
         server_port  => $server_port,
         require      => Service["dirsrv@${server_id}"],
-        before       => Anchor["${name}_ldif_modify"],
       }
     }
   }
@@ -552,7 +551,6 @@
       user                => $user,
       group               => $group,
       require             => Service["dirsrv@${server_id}"],
-      before              => Anchor["${name}_ldif_modify"],
     }
   }
 
@@ -577,10 +575,6 @@
     }
   }
 
-  anchor { "${name}_ldif_modify":
-    require => Service["dirsrv@${server_id}"],
-  }
-
   # ldif modify
   if $modify_ldifs {
     $modify_ldifs.each |$filename, $source| {
@@ -595,14 +589,11 @@
         user         => $user,
         group        => $group,
         tag          => "${server_id}_modify",
-        require      => Anchor["${name}_ldif_modify"],
-        before       => Anchor["${name}_ldif_add"],
+        require      => Service["dirsrv@${server_id}"],
       }
     }
   }
 
-  anchor { "${name}_ldif_add": }
-
   # ldif add
   if $add_ldifs {
     $add_ldifs.each |$filename, $source| {
@@ -617,14 +608,10 @@
         user         => $user,
         group        => $group,
         tag          => "${server_id}_add",
-        require      => Anchor["${name}_ldif_add"],
-        before       => Anchor["${name}_ldif_base_load"],
       }
     }
   }
 
-  anchor { "${name}_ldif_base_load": }
-
   # ldif base_load
   if $base_load_ldifs {
     $base_load_ldifs.each |$filename, $source| {
@@ -639,7 +626,6 @@
         user         => $user,
         group        => $group,
         tag          => "${server_id}_base_load",
-        require      => Anchor["${name}_ldif_base_load"],
       }
     }
   }

diff --git a/manifests/replication.pp b/manifests/replication.pp
@@ -388,7 +388,7 @@
                 path    => $ds_389::path,
                 creates => $repl_init_done,
                 require => [
-                  Anchor["${name}_replication_suppliers"],
+                  Exec["Add replication user: ${name}"],
                   Exec["Create replication agreement for hub ${replica}: ${name}"],
                 ],
               }
@@ -415,7 +415,6 @@
               path    => $ds_389::path,
               creates => $repl_enable_done,
               require => [
-                Anchor["${name}_replication_hubs"],
                 Exec["Add replication user: ${name}"],
               ],
             }
@@ -439,7 +438,7 @@
                 path    => $ds_389::path,
                 creates => $repl_init_done,
                 require => [
-                  Anchor["${name}_replication_consumers"],
+                  Exec["Add replication user: ${name}"],
                   Exec["Create replication agreement for consumer ${replica}: ${name}"],
                 ],
               }
@@ -470,14 +469,4 @@
       Ds_389::Ssl[$name],
     ],
   }
-
-  anchor { "${name}_replication_suppliers":
-    require => Exec["Add replication user: ${name}"],
-  }
-  anchor { "${name}_replication_hubs":
-    require => Anchor["${name}_replication_suppliers"],
-  }
-  anchor { "${name}_replication_consumers":
-    require => Anchor["${name}_replication_hubs"],
-  }
 }