From 8e84b8928036da30a91c2682d7910a23efb29132 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 16 Mar 2020 12:57:54 -0500 Subject: sys-auth/nss-pam-ldapd: moved some files around (no intalled changes) Closes: https://bugs.gentoo.org/712806 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Matthew Thode --- sys-auth/nss-pam-ldapd/files/nslcd-2.service | 14 ----------- sys-auth/nss-pam-ldapd/files/nslcd-init-r3 | 28 ---------------------- sys-auth/nss-pam-ldapd/files/nslcd-run-s6 | 3 --- sys-auth/nss-pam-ldapd/files/nslcd.init | 28 ++++++++++++++++++++++ sys-auth/nss-pam-ldapd/files/nslcd.s6 | 3 +++ sys-auth/nss-pam-ldapd/files/nslcd.service | 14 +++++++++++ sys-auth/nss-pam-ldapd/files/pynslcd.init | 28 ++++++++++++++++++++++ sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 | 28 ---------------------- .../nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild | 8 +++---- 9 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 sys-auth/nss-pam-ldapd/files/nslcd-2.service delete mode 100644 sys-auth/nss-pam-ldapd/files/nslcd-init-r3 delete mode 100644 sys-auth/nss-pam-ldapd/files/nslcd-run-s6 create mode 100644 sys-auth/nss-pam-ldapd/files/nslcd.init create mode 100644 sys-auth/nss-pam-ldapd/files/nslcd.s6 create mode 100644 sys-auth/nss-pam-ldapd/files/nslcd.service create mode 100644 sys-auth/nss-pam-ldapd/files/pynslcd.init delete mode 100644 sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 (limited to 'sys-auth') diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-2.service b/sys-auth/nss-pam-ldapd/files/nslcd-2.service deleted file mode 100644 index b6b167aaed92..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nslcd-2.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=NSS and PAM LDAP client daemon -After=network-online.target -Wants=network-online.target nss-lookup.target syslog.service -Before=nss-user-lookup.target - -[Service] -Type=forking -PIDFile=/run/nslcd/nslcd.pid -ExecStart=/usr/sbin/nslcd - -[Install] -WantedBy=multi-user.target -RequiredBy=nss-user-lookup.target diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r3 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r3 deleted file mode 100644 index 513ad9af3fe1..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nslcd-init-r3 +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command=/usr/sbin/nslcd -pidfile=/run/nslcd/nslcd.pid -extra_commands="checkconfig" -cfg="/etc/nslcd.conf" - -depend() { - need net - use dns logger -} - -checkconfig() { - if [ ! -f "$cfg" ] ; then - eerror "Please create $cfg" - eerror "Example config: /usr/share/nss-ldapd/nslcd.conf" - return 1 - fi - return 0 -} - -start_pre() { - checkpath -q -d /run/nslcd -o nslcd:nslcd - checkconfig - return $? -} diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-run-s6 b/sys-auth/nss-pam-ldapd/files/nslcd-run-s6 deleted file mode 100644 index 264da009ba11..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nslcd-run-s6 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exec 2>&1 -exec /usr/sbin/nslcd -n diff --git a/sys-auth/nss-pam-ldapd/files/nslcd.init b/sys-auth/nss-pam-ldapd/files/nslcd.init new file mode 100644 index 000000000000..959fb601f606 --- /dev/null +++ b/sys-auth/nss-pam-ldapd/files/nslcd.init @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command=/usr/sbin/nslcd +pidfile=/run/nslcd/nslcd.pid +extra_commands="checkconfig" +cfg="/etc/nslcd.conf" + +depend() { + need net + use dns logger +} + +checkconfig() { + if [ ! -f "$cfg" ] ; then + eerror "Please create $cfg" + eerror "Example config: /usr/share/nss-ldapd/nslcd.conf" + return 1 + fi + return 0 +} + +start_pre() { + checkpath -q -d /run/nslcd -o nslcd:nslcd + checkconfig + return $? +} diff --git a/sys-auth/nss-pam-ldapd/files/nslcd.s6 b/sys-auth/nss-pam-ldapd/files/nslcd.s6 new file mode 100644 index 000000000000..264da009ba11 --- /dev/null +++ b/sys-auth/nss-pam-ldapd/files/nslcd.s6 @@ -0,0 +1,3 @@ +#!/bin/sh +exec 2>&1 +exec /usr/sbin/nslcd -n diff --git a/sys-auth/nss-pam-ldapd/files/nslcd.service b/sys-auth/nss-pam-ldapd/files/nslcd.service new file mode 100644 index 000000000000..b6b167aaed92 --- /dev/null +++ b/sys-auth/nss-pam-ldapd/files/nslcd.service @@ -0,0 +1,14 @@ +[Unit] +Description=NSS and PAM LDAP client daemon +After=network-online.target +Wants=network-online.target nss-lookup.target syslog.service +Before=nss-user-lookup.target + +[Service] +Type=forking +PIDFile=/run/nslcd/nslcd.pid +ExecStart=/usr/sbin/nslcd + +[Install] +WantedBy=multi-user.target +RequiredBy=nss-user-lookup.target diff --git a/sys-auth/nss-pam-ldapd/files/pynslcd.init b/sys-auth/nss-pam-ldapd/files/pynslcd.init new file mode 100644 index 000000000000..3165b02843fc --- /dev/null +++ b/sys-auth/nss-pam-ldapd/files/pynslcd.init @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command=/usr/sbin/pynslcd +pidfile=/run/nslcd/nslcd.pid +extra_commands="checkconfig" +cfg="/etc/nslcd.conf" + +depend() { + need net + use dns logger +} + +checkconfig() { + if [ ! -f "$cfg" ] ; then + eerror "Please create $cfg" + eerror "Example config: /usr/share/nss-ldapd/nslcd.conf" + return 1 + fi + return 0 +} + +start_pre() { + checkpath -q -d /run/nslcd -o nslcd:nslcd + checkconfig + return $? +} diff --git a/sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 b/sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 deleted file mode 100644 index 21762ae5fd2b..000000000000 --- a/sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command=/usr/sbin/pynslcd -pidfile=/run/nslcd/nslcd.pid -extra_commands="checkconfig" -cfg="/etc/nslcd.conf" - -depend() { - need net - use dns logger -} - -checkconfig() { - if [ ! -f "$cfg" ] ; then - eerror "Please create $cfg" - eerror "Example config: /usr/share/nss-ldapd/nslcd.conf" - return 1 - fi - return 0 -} - -start_pre() { - checkpath -q -d /run/nslcd -o nslcd:nslcd - checkconfig - return $? -} diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild index f93312d95f08..f581f1f2fe4a 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild @@ -91,8 +91,8 @@ multilib_src_configure() { multilib_src_install_all() { local script - newinitd "${FILESDIR}"/nslcd-init-r3 nslcd - s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6 + newinitd "${FILESDIR}"/nslcd.init nslcd + s6_install_service nslcd "${FILESDIR}"/nslcd.s6 insinto /usr/share/nss-pam-ldapd doins "${WORKDIR}/${P}/nslcd.conf" @@ -113,11 +113,11 @@ multilib_src_install_all() { python_foreach_impl python_domodule pynslcd/*.py python_scriptinto /usr/sbin python_newscript pynslcd.py pynslcd - newinitd "${FILESDIR}"/pynslcd.initd-r2 pynslcd + newinitd "${FILESDIR}"/pynslcd.init pynslcd fi systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf - systemd_newunit "${FILESDIR}"/nslcd-2.service nslcd.service + systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service } multilib_src_install() { -- cgit v1.2.3-65-gdbad