Unverified Commit 781b0348 authored by Jonathan's avatar Jonathan Committed by GitHub
Browse files

Merge pull request #194 from djjudas21/144_rocky8_support 

Rocky 8 support
parents 11e3d32e 564a7198

.fixtures.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ fixtures: 
    logrotate: "puppet/logrotate"

    rsyslog: "saz/rsyslog"

    stdlib: "puppetlabs/stdlib"

    systemd: "camptocamp/systemd"
 
    systemd: "puppet/systemd"

manifests/init.pp

+10 −0
Original line number Diff line number Diff line
@@ -113,6 +113,16 @@ class freeradius ( 
    }

  }



  # 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 { [

metadata.json

+2 −2
Original line number Diff line number Diff line
@@ -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": [

spec/classes/freeradius_spec.rb

+12 −0
Original line number Diff line number Diff line
@@ -391,6 +391,18 @@ describe 'freeradius' do 
        end

      end



      it do

        if ['rocky-8-x86_64', 'centos-8-x86_64', 'redhat-8-x86_64', 'almalinux-8-x86_64'].include? os

          is_expected.to contain_systemd__dropin_file('freeradius remove bootstrap')

            .with_ensure('present')

            .with_filename('remove_bootstrap.conf')

            .with_unit('radiusd.service')

            .with_content(%r{^ExecStartPre=$})

        else

          is_expected.not_to contain_systemd__dropin_file('freeradius remove bootstrap')

        end

      end



      context 'with mysql' do

        let(:params) do

          super().merge(

templates/systemd_dropin_rhel8.erb

0 → 100644
+4 −0
Original line number Diff line number Diff line 
[Service]

ExecStartPre=

ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd

ExecStartPre=/usr/sbin/radiusd -C