100 lines
2.5 KiB
Diff
100 lines
2.5 KiB
Diff
From: Guido Trotter <ultrotter@debian.org>
|
|
Subject: Patch upstream build system to install cpu.conf into /usr/share/cpu
|
|
for later use with ucf in postinst
|
|
|
|
--- a/doc/Makefile.am
|
|
+++ b/doc/Makefile.am
|
|
@@ -3,6 +3,7 @@
|
|
EXTRA_DIST = cpu.conf \
|
|
cpu.conf.doc \
|
|
test.ldif
|
|
+sysconfdir = ../debian/cpu/usr/share/cpu
|
|
|
|
install-data-local:
|
|
@if test -f $(sysconfdir)/cpu.conf ; then \
|
|
--- a/doc/cpu.conf
|
|
+++ b/doc/cpu.conf
|
|
@@ -2,17 +2,18 @@
|
|
|
|
[GLOBAL]
|
|
DEFAULT_METHOD = ldap
|
|
-CRACKLIB_DICTIONARY = /usr/lib/cracklib_dict
|
|
+CRACKLIB_DICTIONARY = /var/cache/cracklib/cracklib_dict
|
|
|
|
[LDAP]
|
|
-LDAP_HOST = 127.0.0.1
|
|
-LDAP_PORT = 389
|
|
+#LDAP_HOST = 127.0.0.1
|
|
+#LDAP_PORT = 389
|
|
# Can also use LDAP_URI = ldaps://localhost:389 for TLS support
|
|
+LDAP_URI = ldap://127.0.0.1
|
|
BIND_DN = cn=Manager,dc=mydomain,dc=com
|
|
BIND_PASS = secret
|
|
USER_BASE = ou=People,dc=mydomain,dc=com
|
|
# replace account with inetOrgPerson if you want first or last name
|
|
-GROUP_BASE = ou=Group,dc=mydomain,dc=com
|
|
+GROUP_BASE = ou=Groups,dc=mydomain,dc=com
|
|
USER_OBJECT_CLASS = account,posixAccount,shadowAccount,top
|
|
GROUP_OBJECT_CLASS = posixGroup,top
|
|
USER_FILTER = (objectClass=posixAccount)
|
|
@@ -23,12 +24,14 @@
|
|
DEFAULT_SHELL = /bin/bash
|
|
HOME_DIRECTORY = /home
|
|
MAX_UIDNUMBER = 10000
|
|
-MIN_UIDNUMBER = 100
|
|
+MIN_UIDNUMBER = 1000
|
|
MAX_GIDNUMBER = 10000
|
|
-MIN_GIDNUMBER = 101
|
|
+MIN_GIDNUMBER = 1000
|
|
ID_MAX_PASSES = 1000
|
|
+# Whether each user should have its own group created or not
|
|
USERGROUPS = yes
|
|
-USERS_GID = 100
|
|
+# If you change usergroup set this to the default group a user should have
|
|
+#USERS_GID = 100
|
|
RANDOM = "false"
|
|
PASSWORD_FILE = "/etc/passfile"
|
|
SHADOW_FILE = "/etc/shadowfile"
|
|
@@ -43,14 +46,3 @@
|
|
SHADOWMIN = -1
|
|
SHADOWINACTIVE = -1
|
|
|
|
-[PASSWD]
|
|
-# Broken
|
|
-GROUP = 1000
|
|
-HOME = /home
|
|
-INACTIVE = -1
|
|
-#EXPIRE =
|
|
-SHELL = /bin/bash
|
|
-SKEL = /etc/skel
|
|
-COMMENT = "Default Gecos"
|
|
-PASSWORD = /etc/passwd
|
|
-SHADOW = /etc/shadow
|
|
--- a/doc/cpu.conf.doc
|
|
+++ b/doc/cpu.conf.doc
|
|
@@ -17,24 +17,6 @@
|
|
CRACKLIB_DICTIONARY = /usr/lib/cracklib_dict
|
|
|
|
############################################
|
|
-# Flatfile Configuration (broken)
|
|
-############################################
|
|
-[PASSWD]
|
|
-# Default Group
|
|
-GROUP = 1000
|
|
-# Home Prefix
|
|
-HOME = /home
|
|
-# Default Inactive
|
|
-INACTIVE = -1
|
|
-#EXPIRE =
|
|
-SHELL = /bin/bash
|
|
-SKEL = /etc/skel
|
|
-COMMENT = "Default Gecos"
|
|
-# What files to read/write from/to
|
|
-PASSWORD = /etc/passwd
|
|
-SHADOW = /etc/shadow
|
|
-
|
|
-############################################
|
|
# LDAP Configuration
|
|
############################################
|
|
[LDAP]
|