diff --git a/plist b/plist index 45a300e82..5d78105e6 100644 --- a/plist +++ b/plist @@ -54,7 +54,6 @@ /usr/local/etc/inc/xmlrpc/service.inc /usr/local/etc/inc/xmlrpc/test.inc /usr/local/etc/netflow.conf.example -/usr/local/etc/pam.d/ipsec /usr/local/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20160725 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20170721 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20150402 @@ -799,6 +798,7 @@ /usr/local/opnsense/service/modules/template.py /usr/local/opnsense/service/run_unittests.py /usr/local/opnsense/service/templates/OPNsense/Auth/+TARGETS +/usr/local/opnsense/service/templates/OPNsense/Auth/ipsec /usr/local/opnsense/service/templates/OPNsense/Auth/motd /usr/local/opnsense/service/templates/OPNsense/Auth/sshd.pam /usr/local/opnsense/service/templates/OPNsense/Auth/sudoers diff --git a/src/opnsense/service/templates/OPNsense/Auth/+TARGETS b/src/opnsense/service/templates/OPNsense/Auth/+TARGETS index 303d04bb0..a71f1bbe3 100644 --- a/src/opnsense/service/templates/OPNsense/Auth/+TARGETS +++ b/src/opnsense/service/templates/OPNsense/Auth/+TARGETS @@ -1,4 +1,5 @@ +ipsec:/etc/pam.d/ipsec motd:/etc/motd sshd.pam:/etc/pam.d/sshd -system.pam:/etc/pam.d/system sudoers:/usr/local/etc/sudoers.d/opnsense +system.pam:/etc/pam.d/system diff --git a/src/etc/pam.d/ipsec b/src/opnsense/service/templates/OPNsense/Auth/ipsec similarity index 100% rename from src/etc/pam.d/ipsec rename to src/opnsense/service/templates/OPNsense/Auth/ipsec diff --git a/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS b/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS index 526a5faa6..64a3ab96c 100644 --- a/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS +++ b/src/opnsense/service/templates/OPNsense/Proxy/+TARGETS @@ -11,4 +11,4 @@ rc.conf.d:/etc/rc.conf.d/squid/squid squid.conf:/usr/local/etc/squid/squid.conf wpad.dat:/usr/local/www/wpad.dat snmp.conf:/usr/local/etc/squid/pre-auth/40-snmp.conf -squid.pam:/usr/local/etc/pam.d/squid +squid.pam:/etc/pam.d/squid