From a9cb4e1b66af4a8d2712e4136a6b264ec3e59d53 Mon Sep 17 00:00:00 2001
From: Luke Kreczko <lkreczko@googlemail.com>
Date: Mon, 27 Jul 2020 16:08:51 +0100
Subject: [PATCH] removed params and hard-coded gridmapfiles

---
 manifests/config.pp      |  7 +++++--
 manifests/params.pp      | 44 ----------------------------------------
 manifests/servicecert.pp |  2 +-
 3 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 manifests/params.pp

diff --git a/manifests/config.pp b/manifests/config.pp
index b984e6a..3f64294 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -90,10 +90,13 @@
 
 
   #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
deleted file mode 100644
index 22cd074..0000000
--- a/manifests/params.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-class argus::params {
-  # site name 
-  $sitename        = hiera('SITENAME','SOME.WHERE')
-
-  # pep params
-  $pepd_port       = hiera('PEPD_DEFAULT_PORT', '8154')
-  $pepd_admin_port = hiera('PEPD_DEFAULT_ADMIN_PORT', '8155')
-  $pepd_pass       = hiera('PEPD_DEFAULT_PASS', randompass() )
-
-  # pdp params
-  $pdps_port       = hiera('PDPS_PORT', '8152')
-  $pdp_port        = hiera('PDP_DEFAULT_PORT', '8152')
-  $pdp_admin_port  = hiera('PDP_DEFAULT_ADMIN_PORT', '8153')
-  $pdp_pass        = hiera('PDP_DEFAULT_PASS', randompass() )
-
-  # pap parameters
-  $pap_port        = hiera('PAP_DEFAULT_PORT', '8150')
-  $pap_shutdown_port = hiera('PAP_DEFAULT_SHUTDOWN_PORT', '8151')
-  $pap_shutdown_command = hiera('PAP_DEFAULT_SHUTDOWN_COMMAND', randompass() )
-
-
-  # central banning setup  
-  $centralbanning_enabled  = hiera('CENTRALBANNING_ENABLED','false')
-  $centralbanning_dn       = hiera('CENTRALBANNING_DN', '')
-  $centralbanning_hostname = hiera('CENTRALBANNING_HOSTNAME', '')
-  $centralbanning_port     = hiera('CENTRALBANNING_PORT', 8150)
-  $poll_interval           = hiera('POLL_INTERVAL', 14400)
-
-  $service_name     = hiera('SERVICE_NAME', $::fqdn)
-  $pap_admin_dn     = hiera('PAP_ADMIN_DN', '')
-  $site_base_dn     = hiera('SITE_BASE_DN', '')
-  $pap_service_dn   = hiera('PAP_SERVICE_DN', "${site_base_dn}=${service_name}")
-  $pap_host_dn      = hiera('PAP_HOST_DN', "${site_base_dn}=${::fqdn}")
-  $nfspath          = hiera('NFSPATH', '')
-  $nfsmountoptions  = hiera('NFSMOUNTOPTIONS', '')
-  $mountpoint       = hiera('MOUNTPOINT', '')
-
-  # additional rules for pap
-  $pap_auth         = hiera('PAP_AUTH','')
-
-  # banning rules
-  $pap_ban          = hiera('PAP_BAN','')
-
-}
diff --git a/manifests/servicecert.pp b/manifests/servicecert.pp
index 9c841f9..a513243 100644
--- 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