From 6f36a83ea255757e7b4478e9974c4e3a1b33b61c Mon Sep 17 00:00:00 2001
From: Remigiusz Marcinkiewicz <enleth@hackerspace.pl>
Date: Wed, 7 Dec 2016 05:26:36 +0100
Subject: [PATCH] Use groupOfUniqueNames groups (with an optional posixGroup
 class) instead of separate groupOfNames and posixGroup; removed several
 obsolete tools as well

---
 bin/add-dn-to-group                               | 11 +++++++++++
 bin/add-dn-to-ldap-group                          | 11 -----------
 bin/add-to-posix-group                            | 11 -----------
 bin/add-to-wiki                                   |  2 +-
 bin/{add-user-to-ldap-group => add-user-to-group} |  4 ++--
 bin/create-posix-group                            |  1 +
 bin/enable-boston-shell                           |  2 +-
 bin/enable-vpn                                    |  2 +-
 bin/enable-xmpp                                   |  2 +-
 bin/enable-zbigniew-shell                         |  7 -------
 bin/grant-member-privileges                       |  3 ++-
 bin/setup-boston-mailbox                          |  4 ++--
 12 files changed, 22 insertions(+), 38 deletions(-)
 create mode 100755 bin/add-dn-to-group
 delete mode 100755 bin/add-dn-to-ldap-group
 delete mode 100755 bin/add-to-posix-group
 rename bin/{add-user-to-ldap-group => add-user-to-group} (60%)
 delete mode 100755 bin/enable-zbigniew-shell

diff --git a/bin/add-dn-to-group b/bin/add-dn-to-group
new file mode 100755
index 0000000..443a104
--- /dev/null
+++ b/bin/add-dn-to-group
@@ -0,0 +1,11 @@
+#!/bin/bash
+#% add-dn-to-group dn group
+#% Add dn to group. group should be a groupOfUniqueNames
+. $LIB_DIR/common.sh
+if [[ $# < 2 ]]; then 
+  show-usage
+  exit 1
+fi
+tag-begin "Add DN $1 to group $2"
+basic-attr-op add $2 uniqueMember $1
+tag-end
diff --git a/bin/add-dn-to-ldap-group b/bin/add-dn-to-ldap-group
deleted file mode 100755
index e705b36..0000000
--- a/bin/add-dn-to-ldap-group
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#% add-dn-to-ldap-group dn group
-#% Add dn to group. group should be a regular LDAP groupOfNames
-. $LIB_DIR/common.sh
-if [[ $# < 2 ]]; then 
-  show-usage
-  exit 1
-fi
-tag-begin "Add DN $1 to group $2"
-basic-attr-op add $2 member $1
-tag-end
diff --git a/bin/add-to-posix-group b/bin/add-to-posix-group
deleted file mode 100755
index 4f33756..0000000
--- a/bin/add-to-posix-group
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#% add-to-posix-group login group
-#% Add user (identified by login) to group. group should be a posixGroup
-. $LIB_DIR/common.sh
-if [[ $# < 2 ]]; then 
-  show-usage
-  exit 1
-fi
-tag-begin "Add user $1 to posix group $2"
-basic-attr-op add "$2" memberUid "$1"
-tag-end
diff --git a/bin/add-to-wiki b/bin/add-to-wiki
index a2c221c..a682708 100755
--- a/bin/add-to-wiki
+++ b/bin/add-to-wiki
@@ -1,4 +1,4 @@
 #!/bin/bash
 #% add-to-wiki user
 #% Give user access to wiki.
-add-user-to-ldap-group $1 'cn=wikiuser,ou=Group,dc=hackerspace,dc=pl'
+add-user-to-group $1 'cn=wikiuser,ou=Group,dc=hackerspace,dc=pl'
diff --git a/bin/add-user-to-ldap-group b/bin/add-user-to-group
similarity index 60%
rename from bin/add-user-to-ldap-group
rename to bin/add-user-to-group
index 9484540..0d58f8b 100755
--- a/bin/add-user-to-ldap-group
+++ b/bin/add-user-to-group
@@ -1,9 +1,9 @@
 #!/bin/bash
-#% add-user-to-ldap-group login groupdn
+#% add-user-to-group login groupdn
 #% Add user with login=login to group groupdn. groupdn should be a regular LDAP groupOfNames
 . $LIB_DIR/common.sh
 if [[ $# < 2 ]]; then 
   show-usage
   exit 1
 fi
-add-dn-to-ldap-group "uid=$1,ou=People,dc=hackerspace,dc=pl" "$2"        
+add-dn-to-group "uid=$1,ou=People,dc=hackerspace,dc=pl" "$2"        
diff --git a/bin/create-posix-group b/bin/create-posix-group
index a9ad845..9a86fef 100755
--- a/bin/create-posix-group
+++ b/bin/create-posix-group
@@ -7,6 +7,7 @@ tag-begin "Create group $1 (gid: $2)"
 push <<EOF
 dn: cn=$1,ou=Group,dc=hackerspace,dc=pl
 changetype: add
+objectClass: groupOfUniqueNames
 objectClass: posixGroup
 cn: $1
 gidNumber: $2
diff --git a/bin/enable-boston-shell b/bin/enable-boston-shell
index 6bfb83b..62f7b7d 100755
--- a/bin/enable-boston-shell
+++ b/bin/enable-boston-shell
@@ -1,7 +1,7 @@
 #!/bin/bash
 #% enable-boston-shell user
 #% Give user shell access to boston-packets. User still needs a valid login shell.
-add-to-posix-group $1 'cn=boston-shell,ou=Group,dc=hackerspace,dc=pl'
+add-user-to-group $1 'cn=boston-shell,ou=Group,dc=hackerspace,dc=pl'
 msg "A home directory on boston-packets is needed for $1."
 msg "You can create it by running:"
 msg "  [itanic ~ #] cp -R /etc/skel /home/$1"
diff --git a/bin/enable-vpn b/bin/enable-vpn
index 3bec3e6..d815f2d 100755
--- a/bin/enable-vpn
+++ b/bin/enable-vpn
@@ -1,4 +1,4 @@
 #!/bin/bash
 #% enable-vpn user
 #% Give user access to VPN
-add-to-posix-group $1 'cn=vpn-users,ou=Group,dc=hackerspace,dc=pl'
+add-user-to-group $1 'cn=vpn-users,ou=Group,dc=hackerspace,dc=pl'
diff --git a/bin/enable-xmpp b/bin/enable-xmpp
index a5ea3a8..848495b 100755
--- a/bin/enable-xmpp
+++ b/bin/enable-xmpp
@@ -1,4 +1,4 @@
 #!/bin/bash
 #% enable-xmpp user
 #% Give user access to XMPP.
-add-user-to-ldap-group $1 'cn=xmpp-users,ou=Group,dc=hackerspace,dc=pl'
+add-user-to-group $1 'cn=xmpp-users,ou=Group,dc=hackerspace,dc=pl'
diff --git a/bin/enable-zbigniew-shell b/bin/enable-zbigniew-shell
deleted file mode 100755
index cbe5926..0000000
--- a/bin/enable-zbigniew-shell
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-#% enable-proliant-shell user
-#% Give user shell access to zbigniew. User still needs a valid login shell.
-add-to-posix-group $1 'cn=zbigniew-shell,ou=Group,dc=hackerspace,dc=pl'
-msg "A home directory on zbigniew is needed for $1."
-msg "You can create it by running:"
-msg "  [proliant ~ #] cp -R /etc/skel /home/$1"
diff --git a/bin/grant-member-privileges b/bin/grant-member-privileges
index 90591e4..cc62dea 100755
--- a/bin/grant-member-privileges
+++ b/bin/grant-member-privileges
@@ -22,8 +22,9 @@ while [ "$1" ]; do
     login="$1"; shift;
     echo "$login: Adding member priviledges (membership group '$membership_group')"
 
-    add-user-to-ldap-group $login "cn=$membership_group,ou=Group,dc=hackerspace,dc=pl"
+    add-user-to-group $login "cn=$membership_group,ou=Group,dc=hackerspace,dc=pl"
     enable-xmpp $login
+    enable-boston-shell $login
     enable-vpn $login
     set-shell $login /bin/bash
 done
diff --git a/bin/setup-boston-mailbox b/bin/setup-boston-mailbox
index 954204c..db5c432 100755
--- a/bin/setup-boston-mailbox
+++ b/bin/setup-boston-mailbox
@@ -2,5 +2,5 @@
 #% setup-boston-mailbox user
 #% Sets up the local mailbox on boston-packets. Has to be run on boston-packets, obviously.
 mkdir /var/spool/mail/$1
-chown $1:mail /var/spool/mail/
-
+chown $1:mail /var/spool/mail/$1
+chmod go-rwx /var/spool/mail/$1