Unverified Commit 680ed366 authored by Nathan Ward's avatar Nathan Ward Committed by GitHub
Browse files

Merge pull request #165 from SearchLightNZ/fix_radsniff_pidfile 

Fix capitalisation of PIDFile
parents ecd70e23 0c64e9ee

spec/classes/radsniff_spec.rb

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ describe 'freeradius::radsniff' do 


        it do

          is_expected.to contain_systemd__unit_file('radsniff.service')

            .with_content(%r{^Pidfile=/var/run/radiusd/radsniff.pid$})

            .with_content(%r{^PIDFile=/var/run/radiusd/radsniff.pid$})

            .with_content(%r{^EnvironmentFile=/etc/sysconfig/radsniff$})

            .with_content(%r{^ExecStart=/usr/bin/radsniff -P /var/run/radiusd/radsniff.pid -d /etc/raddb \$RADSNIFF_OPTIONS$})

            .that_notifies('Service[radsniff]')
@@ -75,7 +75,7 @@ describe 'freeradius::radsniff' do 


        it do

          is_expected.to contain_systemd__unit_file('radsniff.service')

            .with_content(%r{^Pidfile=/var/run/freeradius/radsniff.pid$})

            .with_content(%r{^PIDFile=/var/run/freeradius/radsniff.pid$})

            .with_content(%r{^EnvironmentFile=/etc/defaults/radsniff$})

            .with_content(%r{^ExecStart=/usr/bin/radsniff -P /var/run/freeradius/radsniff.pid -d /etc/freeradius \$RADSNIFF_OPTIONS$})

            .that_notifies('Service[radsniff]')
@@ -112,7 +112,7 @@ describe 'freeradius::radsniff' do 


        it do

          is_expected.to contain_systemd__unit_file('radsniff.service')

            .with_content(%r{^Pidfile=/a/pid/file$})

            .with_content(%r{^PIDFile=/a/pid/file$})

            .with_content(%r{^EnvironmentFile=/test/env/file$})

            .with_content(%r{^ExecStart=/usr/bin/radsniff -P /a/pid/file -d .* \$RADSNIFF_OPTIONS$})

            .that_notifies('Service[radsniff]')

templates/radsniff.service.erb

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ After=radiusd.target 


[Service]

Type=forking

Pidfile=<%=scope['::freeradius::radsniff::final_pidfile']%>

PIDFile=<%=scope['::freeradius::radsniff::final_pidfile']%>

EnvironmentFile=<%=scope['::freeradius::radsniff::final_envfile']%>

ExecStart=/usr/bin/radsniff -P <%=scope['::freeradius::radsniff::final_pidfile']%> -d <%=scope['::freeradius::radsniff::fr_basepath']%> $RADSNIFF_OPTIONS