removed params and hard-coded gridmapfiles

HEP-Puppet · Jul 27, 2020 · 8fd23cd · 8fd23cd
1 parent bb551df
commit 8fd23cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 50 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -86,14 +86,14 @@
 
   include 'argus::centralbanning'
 
-
-
-
   #pepd service must be restarted when the gridmap files change
+  $grid_mapfile = $::argus::grid_mapfile
+  $group_mapfile = $::argus::group_mapfile
+
   File[
-    '/etc/grid-security/grid-mapfile',
+    $grid_mapfile,
     '/etc/grid-security/voms-grid-mapfile',
-    '/etc/grid-security/groupmapfile'
+    $group_mapfile
   ]~>Service['argus-pepd']
 
   File[

diff --git a/manifests/params.pp b/manifests/params.pp
diff --git a/manifests/servicecert.pp b/manifests/servicecert.pp
@@ -1,4 +1,4 @@
-class argus::servicecert inherits argus::params {
+class argus::servicecert {
   $service_name = $::argus::service_name
   if $service_name == $::fqnd {
     # we can use the puppet autogenerated certificate