diff options
author | Nagaraju Goruganti <ngorugan@in.ibm.com> | 2018-09-04 05:56:42 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-11-20 07:02:52 +0300 |
commit | df045f1646e243572ced34273e4b8ba538732790 (patch) | |
tree | 0dda17ac8934275793509ab8d0f33812d3634bd3 /meta-phosphor | |
parent | eeee14fc402d0c54cf0b6480494abb5353c44e67 (diff) | |
download | openbmc-df045f1646e243572ced34273e4b8ba538732790.tar.xz |
Add new LDAP config package
Package app phosphor-ldap-conf. This app implements an API to update
the LDAP config file i.e /etc/nslcd.conf.
This commit also creates a file:/etc/nslcd.conf.default, which is to
be restored as /etc/nslcd.conf when we disable LDAP configuration.
(From meta-phosphor rev: 6d7f640d702b5853268bec58e8529516e7884493)
Change-Id: I7183652732c2200b5cc0a644ddb179c8784eb0fb
Signed-off-by: Nagaraju Goruganti <ngorugan@in.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
4 files changed, 27 insertions, 3 deletions
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index d6537f54f..6e23d1502 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -139,4 +139,5 @@ SUMMARY_${PN}-user-mgmt = "User management applications" RDEPENDS_${PN}-user-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-user-mgmt} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'nss-pam-ldapd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'phosphor-ldap', '', d)} \ " diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.Ldap.Config.service b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.Ldap.Config.service new file mode 100644 index 000000000..dc6d0da4f --- /dev/null +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.Ldap.Config.service @@ -0,0 +1,15 @@ +[Unit] +Description=Phosphor Ldap config updater +Wants=nslcd.service nscd.service +After=nslcd.service nscd.service +Before=xyz.openbmc_project.Software.Sync.service + +[Service] +ExecStart=/usr/bin/env phosphor-ldap-conf +SyslogIdentifier=phosphor-ldap-conf +Restart=always +Type=dbus +BusName={BUSNAME} + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 87d2d947d..d0f261fb9 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -15,17 +15,22 @@ DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" DEPENDS += "nss-pam-ldapd" +PACKAGE_BEFORE_PN = "phosphor-ldap" RDEPENDS_${PN} += "libsystemd" RDEPENDS_${PN} += "phosphor-logging" inherit useradd -USERADD_PACKAGES = "${PN}" +USERADD_PACKAGES = "${PN} phosphor-ldap" +DBUS_PACKAGES = "${USERADD_PACKAGES}" # add groups needed for privilege maintenance GROUPADD_PARAM_${PN} = "priv-admin; priv-operator; priv-user; priv-callback " - +GROUPADD_PARAM_phosphor-ldap = "priv-admin; priv-operator; priv-user; priv-callback " DBUS_SERVICE_${PN} += "xyz.openbmc_project.User.Manager.service" - +FILES_phosphor-ldap += " \ + ${sbindir}/phosphor-ldap-conf \ +" +DBUS_SERVICE_phosphor-ldap = "xyz.openbmc_project.Ldap.Config.service" SRC_URI += "git://github.com/openbmc/phosphor-user-manager" SRCREV = "9891f2f8f330cfe678098342bd1cb536e5810233" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend b/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend new file mode 100644 index 000000000..d1b092d29 --- /dev/null +++ b/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend @@ -0,0 +1,3 @@ +do_install_append() { + install -m 0644 ${D}${sysconfdir}/nslcd.conf ${D}${sysconfdir}/nslcd.conf.default +} |