diff options
author | Eric Thibodeau <kyron@neuralbs.com> | 2008-07-03 02:41:38 -0400 |
---|---|---|
committer | Eric Thibodeau <kyron@neuralbs.com> | 2008-07-03 02:41:38 -0400 |
commit | 9cccd8ed2a77936ff5a57f4813597e20a33bc7e9 (patch) | |
tree | e73f7fd0a0735d7b58b8e702f60d0656e5e68c1e | |
parent | "##DISPLAY_MANAGER" --> hardcoded to "gdm" in motd (diff) | |
download | clustering-livecd-9cccd8ed2a77936ff5a57f4813597e20a33bc7e9.tar.gz clustering-livecd-9cccd8ed2a77936ff5a57f4813597e20a33bc7e9.tar.bz2 clustering-livecd-9cccd8ed2a77936ff5a57f4813597e20a33bc7e9.zip |
Correct bgus in the ebuilds (incomplete variable changes)
Add compensation for missing dirs on LiveCD (openldap ebuild not creating /var/run/openldap ...bug?)
-rw-r--r-- | overlay/net-nds/ldap-auth/Manifest | 2 | ||||
-rw-r--r-- | overlay/net-nds/ldap-auth/ldap-auth-0.1.ebuild | 19 | ||||
-rw-r--r-- | overlay/sys-cluster/beowulf-head/Manifest | 2 | ||||
-rw-r--r-- | overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/overlay/net-nds/ldap-auth/Manifest b/overlay/net-nds/ldap-auth/Manifest index 598ff1d..0132572 100644 --- a/overlay/net-nds/ldap-auth/Manifest +++ b/overlay/net-nds/ldap-auth/Manifest @@ -1,2 +1,2 @@ AUX cluster_ldap_skel.conf 3849 RMD160 21ddf218b92583b48ee0cfca2936d2eb55c6d652 SHA1 c79f463486e88ada5af76ed19c465a97bb680bf6 SHA256 473d7bab701aaac2b9091c577cebdca4822ec37b8ed94002f33a37cf6e329bbf -EBUILD ldap-auth-0.1.ebuild 12829 RMD160 e12966ea515f3ae1fea96d1e3b8d6169c26709f5 SHA1 caa251a04b6be9ef9a7e10b4800c5b63f65263a3 SHA256 bd1521f87726b3b428dca7071b6ab37e8fc4c750913ca3ecf9759598a97e1db9 +EBUILD ldap-auth-0.1.ebuild 13594 RMD160 ce84849c1a6c8ffa6ee3d105856cc8cc851595d6 SHA1 be9e46a60e3adbf0b09e3528bf0744b049611fc8 SHA256 52ba0d363484b4328da2d96fb97a98a904b7dc050b600dcf35fb6f3b55b1f17a diff --git a/overlay/net-nds/ldap-auth/ldap-auth-0.1.ebuild b/overlay/net-nds/ldap-auth/ldap-auth-0.1.ebuild index 8c2ceaf..6d1e420 100644 --- a/overlay/net-nds/ldap-auth/ldap-auth-0.1.ebuild +++ b/overlay/net-nds/ldap-auth/ldap-auth-0.1.ebuild @@ -68,6 +68,9 @@ parse_config() make_slapd_conf() { + ewarn "$SLAPDCONF will be created with the password you defined in " + ewarn "$CONFPATH/ldap_auth.conf. This password also affects dirarm." + [ -f $SLAPDCONF ] && mv $SLAPDCONF ${SLAPDCONF}.${PN}.bak cat > $SLAPDCONF <<-EOF # @@ -389,9 +392,15 @@ creade_db() #chown -R ldap: `awk '/^directory/ {print $2}' $SLAPDCONF` chown -R ldap: $DBDIR + einfo "Creating /var/run/openldap/ with proper permissions." + mkdir -p /var/run/openldap/ + chown ldap: /var/run/openldap/ + if ! use livecd; then einfo "Starting slapd" /etc/init.d/slapd start || ewarn "Failed to start slapd, check /var/log/messages"; + else + ewarn "Don't forget to start slapd as soon as the script completes!" fi einfo "Adding slapd to default runlevel" @@ -406,6 +415,15 @@ config_diradm() -e 's:DEFAULT_LOGINSHELL="/bin/localshell":DEFAULT_LOGINSHELL="/bin/bash":' \ ${ROOT}/etc/diradm.conf + ewarn "You must now use 'diradm' as your user, group and password manager!!!" + ewarn "For diradm to work, the rootdn password has to be put in cleartext in" + ewarn "/etc/ldap.secret and the files has to be readable by root only." + ewarn "The script does that for you but you're responsible for managing that" + ewarn "file. You have been warned!" + + echo ${ROOTDNPWD} > /etc/ldap.secret + chmod 600 /etc/ldap.secret + # When we enable automount, we'll add the stuff here } @@ -422,6 +440,7 @@ pkg_config() make_slapd_conf make_ldif config_diradm + echo # Don't create the DB on a live system if that's not # where we want to install [[ ${ROOT} == "/" ]] && creade_db diff --git a/overlay/sys-cluster/beowulf-head/Manifest b/overlay/sys-cluster/beowulf-head/Manifest index 5529deb..8c94d58 100644 --- a/overlay/sys-cluster/beowulf-head/Manifest +++ b/overlay/sys-cluster/beowulf-head/Manifest @@ -1,2 +1,2 @@ AUX cluster.conf 1592 RMD160 58464c00571c6c84e7ed1d63686f0d02f88b1597 SHA1 1d35aaba87de3a40de6a5922777f0760453cbf75 SHA256 8065a6610621e233d966b5c45f154fcba1ca1c699f42c86af7ae9f5b16053d65 -EBUILD beowulf-head-0.1.ebuild 3931 RMD160 4d211ea9f59c44629154e7944d699123e99dff9b SHA1 591918dabc5ab85a2f76d18220c943fd12dc9b8b SHA256 ed2ced00353a35e973d168583a65afee1cd70263e1bd06a1974cfd18674314f1 +EBUILD beowulf-head-0.1.ebuild 3929 RMD160 5da7640e581b3efe59181811e6da491288e8e75a SHA1 390b1d58e12ee76f188afd4c22865bb19cbf3980 SHA256 d78bf247106c51e1752ae47cce16e54665f83472d8dae329d900f41106e47a88 diff --git a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild index d6ac242..b88339e 100644 --- a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild +++ b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild @@ -136,7 +136,7 @@ src_install() { dodir ${CONFPATH} insinto ${CONFPATH} - doins ${FILESDIR}/${TEMPLATE_FILE} + doins ${FILESDIR}/${CONFIG_FILE} if ! use autoconfigure; then elog "You need to edit ${CONFPATH}/${CONFIG_FILE} to your likings" |