1 |
diff -up e-smith-base-5.2.0/createlinks.cpu-conf e-smith-base-5.2.0/createlinks |
2 |
--- e-smith-base-5.2.0/createlinks.cpu-conf 2010-11-01 07:55:51.000000000 -0600 |
3 |
+++ e-smith-base-5.2.0/createlinks 2010-11-01 07:58:01.000000000 -0600 |
4 |
@@ -214,6 +214,19 @@ foreach my $file (qw( |
5 |
templates2events($file, qw(console-save bootstrap-console-save)); |
6 |
} |
7 |
|
8 |
+foreach my $file (qw( |
9 |
+ /etc/cpu.conf |
10 |
+ /etc/cpu-system.conf |
11 |
+ )) |
12 |
+{ |
13 |
+ templates2events("$_", qw( |
14 |
+ post-upgrade |
15 |
+ console-save |
16 |
+ bootstrap-console-save |
17 |
+ ldap-update |
18 |
+ )); |
19 |
+} |
20 |
+ |
21 |
# conf-userlists |
22 |
|
23 |
foreach (qw(users.allow accounts.allow accounts.deny)) |
24 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/00header.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/00header |
25 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/00header.cpu-conf 2010-11-01 07:58:29.000000000 -0600 |
26 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/00header 2010-11-01 07:58:43.000000000 -0600 |
27 |
@@ -0,0 +1,3 @@ |
28 |
+[GLOBAL] |
29 |
+DEFAULT_METHOD = ldap |
30 |
+ |
31 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/05ldap.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/05ldap |
32 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/05ldap.cpu-conf 2010-11-01 07:58:51.000000000 -0600 |
33 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/05ldap 2010-11-01 07:59:03.000000000 -0600 |
34 |
@@ -0,0 +1,4 @@ |
35 |
+[LDAP] |
36 |
+LDAP_HOST = localhost |
37 |
+LDAP_PORT = 389 |
38 |
+ |
39 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/10bindpw.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/10bindpw |
40 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/10bindpw.cpu-conf 2010-11-01 07:59:18.000000000 -0600 |
41 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/10bindpw 2010-11-01 07:59:34.000000000 -0600 |
42 |
@@ -0,0 +1,2 @@ |
43 |
+BIND_DN = "cn=root,{ esmith::util::ldapBase ($DomainName); }" |
44 |
+BIND_PASS = { esmith::util::LdapPassword (); } |
45 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/15defaultObjectClass.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/15defaultObjectClass |
46 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/15defaultObjectClass.cpu-conf 2010-11-01 08:00:02.000000000 -0600 |
47 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/15defaultObjectClass 2010-11-01 08:00:19.000000000 -0600 |
48 |
@@ -0,0 +1,10 @@ |
49 |
+{ |
50 |
+ |
51 |
+our @userObjectClass = qw(inetOrgPerson posixAccount shadowAccount); |
52 |
+our @systemUserObjectClass =qw(account posixAccount shadowAccount); |
53 |
+our @groupObjectClass = qw(posixGroup mailboxRelatedObject); |
54 |
+our @systemGroupObjectClass = qw(posixGroup); |
55 |
+ |
56 |
+$OUT .= ""; |
57 |
+ |
58 |
+} |
59 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/20objectClass.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/20objectClass |
60 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/20objectClass.cpu-conf 2010-11-01 08:00:27.000000000 -0600 |
61 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/20objectClass 2010-11-01 08:01:06.000000000 -0600 |
62 |
@@ -0,0 +1,15 @@ |
63 |
+{ |
64 |
+if ($ACCOUNT eq 'system'){ |
65 |
+ $OUT .= "USER_OBJECT_CLASS = " . join(",",@systemUserObjectClass) . "\n"; |
66 |
+ $OUT .= "GROUP_OBJECT_CLASS = " . join(",",@systemGroupObjectClass) . "\n"; |
67 |
+} |
68 |
+else{ |
69 |
+ $OUT .= "USER_OBJECT_CLASS = " . join(",",@userObjectClass) . "\n"; |
70 |
+ $OUT .= "GROUP_OBJECT_CLASS = " . join(",",@groupObjectClass) . "\n"; |
71 |
+ |
72 |
+} |
73 |
+ |
74 |
+$OUT .= "USER_BASE = ou=Users," . esmith::util::ldapBase ($DomainName) . "\n"; |
75 |
+$OUT .= "GROUP_BASE = ou=Groups," . esmith::util::ldapBase ($DomainName) ."\n"; |
76 |
+ |
77 |
+} |
78 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/25filter.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/25filter |
79 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/25filter.cpu-conf 2010-11-01 08:01:25.000000000 -0600 |
80 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/25filter 2010-11-01 08:01:37.000000000 -0600 |
81 |
@@ -0,0 +1,2 @@ |
82 |
+USER_FILTER = (objectClass=posixAccount) |
83 |
+GROUP_FILTER = (objectClass=posixGroup) |
84 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/30cnString.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/30cnString |
85 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/30cnString.cpu-conf 2010-11-01 08:01:42.000000000 -0600 |
86 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/30cnString 2010-11-01 08:01:52.000000000 -0600 |
87 |
@@ -0,0 +1,2 @@ |
88 |
+USER_CN_STRING = uid |
89 |
+GROUP_CN_STRING = cn |
90 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/35skel.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/35skel |
91 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/35skel.cpu-conf 2010-11-01 08:02:06.000000000 -0600 |
92 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/35skel 2010-11-01 08:02:17.000000000 -0600 |
93 |
@@ -0,0 +1 @@ |
94 |
+SKEL_DIR = /etc/e-smith/skel/user |
95 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/40shell.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/40shell |
96 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/40shell.cpu-conf 2010-11-01 08:02:23.000000000 -0600 |
97 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/40shell 2010-11-01 08:02:32.000000000 -0600 |
98 |
@@ -0,0 +1 @@ |
99 |
+DEFAULT_SHELL = /usr/bin/rssh |
100 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/45homeDir.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/45homeDir |
101 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/45homeDir.cpu-conf 2010-11-01 08:02:43.000000000 -0600 |
102 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/45homeDir 2010-11-01 08:02:51.000000000 -0600 |
103 |
@@ -0,0 +1 @@ |
104 |
+HOME_DIRECTORY = /home/e-smith/files/users |
105 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/50uidGid.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/50uidGid |
106 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/50uidGid.cpu-conf 2010-11-01 08:02:59.000000000 -0600 |
107 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/50uidGid 2010-11-01 08:03:13.000000000 -0600 |
108 |
@@ -0,0 +1,8 @@ |
109 |
+MAX_UIDNUMBER = 10000 |
110 |
+MIN_UIDNUMBER = 100 |
111 |
+MAX_GIDNUMBER = 10000 |
112 |
+MIN_GIDNUMBER = 101 |
113 |
+ID_MAX_PASSES = 1000 |
114 |
+USERGROUPS = yes |
115 |
+USERS_GID = 100 |
116 |
+RANDOM = "false" |
117 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/55passwdShadow.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/55passwdShadow |
118 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/55passwdShadow.cpu-conf 2010-11-01 08:03:43.000000000 -0600 |
119 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/55passwdShadow 2010-11-01 08:03:56.000000000 -0600 |
120 |
@@ -0,0 +1,2 @@ |
121 |
+PASSWORD_FILE = "/etc/passfile" |
122 |
+SHADOW_FILE = "/etc/shadowfile" |
123 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/60hash.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/60hash |
124 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/60hash.cpu-conf 2010-11-01 08:04:04.000000000 -0600 |
125 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/60hash 2010-11-01 08:04:15.000000000 -0600 |
126 |
@@ -0,0 +1 @@ |
127 |
+HASH = "crypt" |
128 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/65shadow.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/65shadow |
129 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/65shadow.cpu-conf 2010-11-01 08:04:23.000000000 -0600 |
130 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/cpu.conf/65shadow 2010-11-01 08:04:35.000000000 -0600 |
131 |
@@ -0,0 +1,7 @@ |
132 |
+SHADOWLASTCHANGE = 11192 |
133 |
+SHADOWMAX = 99999 |
134 |
+SHADOWWARING = 7 |
135 |
+SHADOWEXPIRE = -1 |
136 |
+SHADOWFLAG = 134538308 |
137 |
+SHADOWMIN = -1 |
138 |
+SHADOWINACTIVE = -1 |
139 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu.conf.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu.conf |
140 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu.conf.cpu-conf 2010-11-01 08:10:45.000000000 -0600 |
141 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu.conf 2010-11-01 08:10:55.000000000 -0600 |
142 |
@@ -0,0 +1,2 @@ |
143 |
+PERMS=0600 |
144 |
+MORE_DATA={ ACCOUNT => "user" } |
145 |
diff -up e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu-system.conf.cpu-conf e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu-system.conf |
146 |
--- e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu-system.conf.cpu-conf 2010-11-01 08:11:06.000000000 -0600 |
147 |
+++ e-smith-base-5.2.0/root/etc/e-smith/templates.metadata/etc/cpu-system.conf 2010-11-01 08:11:20.000000000 -0600 |
148 |
@@ -0,0 +1,4 @@ |
149 |
+PERMS=0600 |
150 |
+TEMPLATE_PATH="/etc/cpu.conf" |
151 |
+OUTPUT_FILENAME="/etc/cpu-system.conf" |
152 |
+MORE_DATA={ ACCOUNT => "system" } |