[26785] in Source-Commits
/svn/athena r25754 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Sep 7 14:26:27 2012
Date: Fri, 7 Sep 2012 14:26:20 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201209071826.q87IQKtO006212@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-09-07 14:26:20 -0400 (Fri, 07 Sep 2012)
New Revision: 25754
Added:
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config-sudoers
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/control.in
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
Log:
In cluster-login-config:
* Stop scribbling over sudoers and use sudoers.d (Trac: #1219)
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2012-09-07 17:26:11 UTC (rev 25753)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2012-09-07 18:26:20 UTC (rev 25754)
@@ -5,8 +5,9 @@
* Port the rest of the gconf mandatory keys to gsettings
* De-support (and Break:) gdm << 2.25.2
* Stop supporting Lucid and cleanup the rules file
+ * Stop scribbling over sudoers and use sudoers.d (Trac: #1219)
- -- Jonathan Reed <jdreed@mit.edu> Fri, 07 Sep 2012 13:26:02 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 07 Sep 2012 14:25:53 -0400
debathena-cluster-login-config (1.37) unstable; urgency=low
Modified: trunk/debathena/config/cluster-login-config/debian/control.in
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/control.in 2012-09-07 17:26:11 UTC (rev 25753)
+++ trunk/debathena/config/cluster-login-config/debian/control.in 2012-09-07 18:26:20 UTC (rev 25754)
@@ -7,7 +7,7 @@
Package: debathena-cluster-login-config
Architecture: all
-Depends: ${misc:Depends}, debathena-afs-config, debathena-gdm-config, debathena-kiosk, gconf2, gnome-screensaver, update-notifier-common, debathena-machtype (>= 10.0.2-0debathena1~), python-dbus, grub-common
+Depends: ${misc:Depends}, debathena-afs-config, debathena-gdm-config, debathena-kiosk, gconf2, gnome-screensaver, update-notifier-common, debathena-machtype (>= 10.0.2-0debathena1~), python-dbus, grub-common, sudo (>= 1.7.2p1-1~)
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Breaks: debathena-reactivate (<< 2~), gdm (<< 2.25.2~)
Added: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config-sudoers
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config-sudoers (rev 0)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config-sudoers 2012-09-07 18:26:20 UTC (rev 25754)
@@ -0,0 +1,4 @@
+# debathena-cluster-login-config enables sudo for the admin group
+ALL !ALL=!ALL
+%admin ALL=(ALL) ALL
+
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2012-09-07 17:26:11 UTC (rev 25753)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2012-09-07 18:26:20 UTC (rev 25754)
@@ -5,3 +5,4 @@
debian/disable-suspend.pkla etc/polkit-1/localauthority/30-site.d
debian/disable-hibernate.pkla etc/polkit-1/localauthority/30-site.d
debian/50_debathena-cluster etc/grub.d
+debian/debathena-cluster-login-config-sudoers etc/sudoers.d
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2012-09-07 17:26:11 UTC (rev 25753)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2012-09-07 18:26:20 UTC (rev 25754)
@@ -129,12 +129,9 @@
# Attempt to initially set the root password.
/usr/sbin/athena-root-password
- cat >>/etc/sudoers <<EOF
-### BEGIN debathena-cluster-login-config
-ALL !ALL=!ALL
-%admin ALL=(ALL) ALL
-### END debathena-cluster-login-config
-EOF
+ # Files in sudoers.d must be chmod 0440 and not contain . or ~
+ # Sadly, dh_installsudoers is not a thing.
+ chmod 0440 /etc/sudoers.d/debathena-cluster-login-config-sudoers
exit 0
;;
