From 0c64e9ee25a9356a421c282da29c86b669ff2aa3 Mon Sep 17 00:00:00 2001 From: Nathan Ward Date: Tue, 1 Jun 2021 11:29:34 +1200 Subject: [PATCH] Fix capitalisation of PIDFile --- spec/classes/radsniff_spec.rb | 6 +++--- templates/radsniff.service.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/classes/radsniff_spec.rb b/spec/classes/radsniff_spec.rb index 5687907b..2d627673 100644 --- a/spec/classes/radsniff_spec.rb +++ b/spec/classes/radsniff_spec.rb @@ -60,7 +60,7 @@ 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 @@ 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 @@ 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]') diff --git a/templates/radsniff.service.erb b/templates/radsniff.service.erb index baf50dc8..a9a8064a 100644 --- a/templates/radsniff.service.erb +++ b/templates/radsniff.service.erb @@ -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