Add drop-in to disable certificate bootstrap

djjudas21 · Aug 17, 2023 · c68f394 · c68f394
1 parent f36ac50
commit c68f394
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -5,4 +5,4 @@ fixtures:
     logrotate: "puppet/logrotate"
     rsyslog: "saz/rsyslog"
     stdlib: "puppetlabs/stdlib"
-    systemd: "camptocamp/systemd"
+    systemd: "puppet/systemd"
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -105,6 +105,16 @@
     notify  => Service[$freeradius::fr_service],
   }
 
+  # Add systemd unit to override default file on RHEL8 systems.
+  if ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8') {
+    systemd::dropin_file { 'freeradius remove bootstrap':
+      ensure   => present,
+      filename => 'remove_bootstrap.conf',
+      unit     => 'radiusd.service',
+      content  => template('freeradius/systemd_dropin_rhel8.erb'),
+    }
+  }
+
   # Preserve some stock modules
   if ($preserve_mods) {
     freeradius::module { [

diff --git a/metadata.json b/metadata.json
@@ -29,8 +29,8 @@
       "version_requirement": ">=1.0.0 <7.0.0"
     },
     {
-      "name": "camptocamp/systemd",
-      "version_requirement": ">=2.0.0 <3.0.0"
+      "name": "puppet/systemd",
+      "version_requirement": ">=3.0.0 <5.0.0"
     }
   ],
   "operatingsystem_support": [

diff --git a/templates/systemd_dropin_rhel8.erb b/templates/systemd_dropin_rhel8.erb
@@ -0,0 +1,4 @@
+[Service]
+ExecStartPre=
+ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd
+ExecStartPre=/usr/sbin/radiusd -C