- Fix #77.

- Fix #86.
linuxmuster · Mar 7, 2020 · 5cf5735 · 5cf5735
1 parent 0f531fc
commit 5cf5735
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 160 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+linuxmuster-base7 (7.0.51-0ubuntu0) lmn7; urgency=low
+
+  * Fix #86: added sudo users student & teacher.
+  * Fix #77: Removed remnant files in /etc/linuxmuster.
+
+ -- Thomas Schmitt <thomas@linuxmuster.net>  Sat, 07 Mar 2020 21:08:58 +0100
+
 linuxmuster-base7 (7.0.50-0ubuntu0) lmn7; urgency=low
 
   * postinst: improved recognition of already configured opnsense firewall.

diff --git a/debian/postinst b/debian/postinst
@@ -2,7 +2,7 @@
 #
 # postinst script for linuxmuster-base
 # thomas@linuxmuster.net
-# 20200306
+# 20200307
 # GPL v3
 #
 
@@ -110,6 +110,12 @@ case "$1" in
     systemctl start ntp.service
   fi
 
+  # add sudo users for webui
+  id teacher &> /dev/null || useradd -u 901 -g nogroup -G sudo -c 'teacher sudo user' -s /bin/sh -M teacher
+  id student &> /dev/null || useradd -u 902 -g nogroup -G sudo -c 'student sudo user' -s /bin/sh -M student
+  chmod 400 /etc/sudoers.d/teacher
+  chmod 400 /etc/sudoers.d/student
+
   # fix #83, patch opnsense's web-proxy sso configuration (only if system is configured)
   if [ -e "$FWAPIKEYS" ]; then
     if ssh -q -oStrictHostKeyChecking=accept-new "$firewallip" exit; then

diff --git a/etc/linuxmuster/allowed_ports b/etc/linuxmuster/allowed_ports
diff --git a/etc/linuxmuster/base_ports b/etc/linuxmuster/base_ports
diff --git a/etc/linuxmuster/blocked_ports b/etc/linuxmuster/blocked_ports
diff --git a/etc/linuxmuster/classrooms b/etc/linuxmuster/classrooms
diff --git a/etc/linuxmuster/clientcert.conf b/etc/linuxmuster/clientcert.conf
diff --git a/etc/linuxmuster/cyrus-mbox.conf b/etc/linuxmuster/cyrus-mbox.conf
diff --git a/etc/linuxmuster/printers b/etc/linuxmuster/printers
diff --git a/etc/linuxmuster/room_defaults b/etc/linuxmuster/room_defaults
diff --git a/etc/linuxmuster/samba/root-postexec.d/README b/etc/linuxmuster/samba/root-postexec.d/README
diff --git a/etc/linuxmuster/samba/root-preexec.d/README b/etc/linuxmuster/samba/root-preexec.d/README
diff --git a/etc/sudoers.d/student b/etc/sudoers.d/student
@@ -0,0 +1 @@
+student ALL=(ALL) NOPASSWD: /usr/sbin/sophomorix-passwd,/usr/sbin/sophomorix-query
diff --git a/etc/sudoers.d/teacher b/etc/sudoers.d/teacher
@@ -0,0 +1 @@
+teacher ALL=(ALL) NOPASSWD: /usr/sbin/sophomorix-passwd,/usr/sbin/sophomorix-query