[debian-edu-commits] debian-edu/ 01/01: Add LDAP posixGroup "printer-admins" to LDAP bootstrap and make this group the system group in CUPS. (Closes: #793678).

Wed Oct 14 14:17:02 UTC 2015

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-config.

commit 5d3caa67b152e9c03f30157bf8f8ca9075313dce
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 14 16:14:28 2015 +0200

    Add LDAP posixGroup "printer-admins" to LDAP bootstrap and make this group the system group in CUPS. (Closes: #793678).
---
 Makefile                            |  1 +
 cf/cf.cups                          |  1 +
 debian/changelog                    |  2 +
 etc/cups/cups-files-debian-edu.conf | 94 +++++++++++++++++++++++++++++++++++++
 ldap-bootstrap/gosa.ldif            |  8 ++++
 5 files changed, 106 insertions(+)

diff --git a/Makefile b/Makefile
index 20daebc..1b54d45 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ SYSCONFFILES = \
 	cfengine/update.conf \
 	cfengine/inputs/cfagent.conf \
 	cups/cupsd-debian-edu.conf \
+	cups/cups-files-debian-edu.conf \
 	dhcp/dhclient-exit-hooks.d/autofs-reload \
 	dhcp/dhclient-exit-hooks.d/wpad-proxy-update \
 	dhcp/dhclient-exit-hooks.d/fetch-ldap-cert \
diff --git a/cf/cf.cups b/cf/cf.cups
index 4dd1877..612c699 100644
--- a/cf/cf.cups
+++ b/cf/cf.cups
@@ -3,3 +3,4 @@ links:
   debian.installation::
 
     /etc/cups/cupsd.conf ->! /etc/cups/cupsd-debian-edu.conf
+    /etc/cups/cups-files.conf ->! /etc/cups/cups-files-debian-edu.conf
diff --git a/debian/changelog b/debian/changelog
index 315ab1e..fec9092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ debian-edu-config (1.819) UNRELEASED; urgency=low
   * Set configVersion="Managed-by-Debian-Edu" in gosa.conf. (Closes: #794189).
     This requires gosa (>= 2.7.4+reloaded2-1+deb8u2~) to be installed on the
     main server.
+  * Add LDAP posixGroup "printer-admins" to LDAP bootstrap and make this
+    group the system group in CUPS. (Closes: #793678).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 16 May 2015 23:12:06 +0200
 
diff --git a/etc/cups/cups-files-debian-edu.conf b/etc/cups/cups-files-debian-edu.conf
new file mode 100644
index 0000000..1f4c729
--- /dev/null
+++ b/etc/cups/cups-files-debian-edu.conf
@@ -0,0 +1,94 @@
+# Sample file/directory/user/group configuration file for the CUPS scheduler.
+# See "man cups-files.conf" for a complete description of this file.
+#
+
+# List of events that are considered fatal errors for the scheduler...
+#FatalErrors config
+
+# Do we call fsync() after writing configuration or status files?
+#SyncOnClose Yes
+
+# Default user and group for filters/backends/helper programs; this cannot be
+# any user or group that resolves to ID 0 for security reasons...
+#User lp
+#Group lp
+
+# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules...
+SystemGroup printer-admins
+
+
+# User that is substituted for unauthenticated (remote) root accesses...
+#RemoteRoot remroot
+
+# Do we allow file: device URIs other than to /dev/null?
+#FileDevice No
+
+# Permissions for configuration and log files...
+#ConfigFilePerm 0640
+#LogFilePerm 00640
+
+# Location of the file logging all access to the scheduler; may be the name
+# "syslog". If not an absolute path, the value of ServerRoot is used as the
+# root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
+AccessLog /var/log/cups/access_log
+
+# Location of cache files used by the scheduler...
+#CacheDir /var/cache/cups
+
+# Location of data files used by the scheduler...
+#DataDir /usr/share/cups
+
+# Location of the static web content served by the scheduler...
+#DocumentRoot /usr/share/cups/doc-root
+
+# Location of the file logging all messages produced by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "LogLevel"
+# directive in cupsd.conf.
+ErrorLog /var/log/cups/error_log
+
+# Location of fonts used by older print filters...
+#FontPath /usr/share/cups/fonts
+
+# Location of LPD configuration
+#LPDConfigFile 
+
+# Location of the file logging all pages printed by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "PageLogFormat"
+# directive in cupsd.conf.
+PageLog /var/log/cups/page_log
+
+# Location of the file listing all of the local printers...
+#Printcap /var/run/cups/printcap
+
+# Format of the Printcap file...
+#PrintcapFormat bsd
+#PrintcapFormat plist
+#PrintcapFormat solaris
+
+# Location of all spool files...
+#RequestRoot /var/spool/cups
+
+# Location of helper programs...
+#ServerBin /usr/lib/cups
+
+# SSL/TLS certificate for the scheduler...
+#ServerCertificate ssl/server.crt
+
+# SSL/TLS private key for the scheduler...
+#ServerKey ssl/server.key
+
+# Location of other configuration files...
+#ServerRoot /etc/cups
+
+# Location of Samba configuration file...
+#SMBConfigFile 
+
+# Location of scheduler state files...
+#StateDir /var/run/cups
+
+# Location of scheduler/helper temporary files. This directory is emptied on
+# scheduler startup and cannot be one of the standard (public) temporary
+# directory locations for security reasons...
+#TempDir /var/spool/cups/tmp
diff --git a/ldap-bootstrap/gosa.ldif b/ldap-bootstrap/gosa.ldif
index 70a5afe..cb7941e 100644
--- a/ldap-bootstrap/gosa.ldif
+++ b/ldap-bootstrap/gosa.ldif
@@ -213,3 +213,11 @@ cn: gosa-admins
 description: GOsa² Administrators
 gidNumber: 60000
 memberUid: $FIRSTUSERNAME
+
+dn: cn=printer-admins,ou=group,dc=skole,dc=skolelinux,dc=no
+objectClass: top
+objectClass: posixGroup
+cn: printer-admins
+description: Printer Operators
+gidNumber: 60010
+memberUid: $FIRSTUSERNAME

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git

