| 1 |
mrjhb3 |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade |
| 2 |
|
|
--- e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2009-10-08 21:43:25.000000000 -0500 |
| 3 |
|
|
+++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2009-10-08 21:42:14.000000000 -0500 |
| 4 |
|
|
@@ -50,23 +50,19 @@ |
| 5 |
|
|
#and on a 6.x and 7.x install, this would have already been run. John H. Bennett III |
| 6 |
|
|
# These are all safe to run multiple times |
| 7 |
|
|
|
| 8 |
|
|
-#my @statements = ( |
| 9 |
|
|
-# 'CHANGE object_homeAddress object_homeaddress VARCHAR(255)', |
| 10 |
|
|
-# 'CHANGE object_workAddress object_workaddress VARCHAR(255)', |
| 11 |
|
|
-# 'CHANGE object_homePhone object_homephone VARCHAR(25)', |
| 12 |
|
|
-# 'CHANGE object_workPhone object_workphone VARCHAR(25)', |
| 13 |
|
|
-# 'CHANGE object_cellPhone object_cellphone VARCHAR(25)', |
| 14 |
|
|
-# 'MODIFY object_title VARCHAR(255)', |
| 15 |
|
|
-# 'MODIFY object_company VARCHAR(255)', |
| 16 |
|
|
-#); |
| 17 |
|
|
- |
| 18 |
|
|
-#foreach my $statement (@statements) |
| 19 |
|
|
-#{ |
| 20 |
|
|
-# $statement = |
| 21 |
|
|
-# $db_turbahandle->prepare("alter table turba_objects $statement") |
| 22 |
|
|
-# or die "prepare: $$statement: $DBI::errstr"; |
| 23 |
|
|
-# $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 24 |
|
|
-#} |
| 25 |
|
|
+my @statements = ( |
| 26 |
|
|
+ "ALTER TABLE turba_shares CHANGE share_owner share_owner VARCHAR(255)", |
| 27 |
|
|
+ "ALTER TABLE turba_shares_users CHANGE user_uid user_uid VARCHAR(255)", |
| 28 |
|
|
+ "ALTER TABLE turba_shares_groups CHANGE group_uid group_uid VARCHAR(255)", |
| 29 |
|
|
+); |
| 30 |
|
|
+ |
| 31 |
|
|
+foreach my $statement (@statements) |
| 32 |
|
|
+{ |
| 33 |
|
|
+ $statement = |
| 34 |
|
|
+ $db_turbahandle->prepare("$statement") |
| 35 |
|
|
+ or die "prepare: $$statement: $DBI::errstr"; |
| 36 |
|
|
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 37 |
|
|
+} |
| 38 |
|
|
|
| 39 |
|
|
# We now need to create some columns, but we need to first check |
| 40 |
|
|
# whether they exist already |
| 41 |
|
|
@@ -447,36 +443,6 @@ |
| 42 |
|
|
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 43 |
|
|
} |
| 44 |
|
|
|
| 45 |
|
|
- unless (defined $turba_shares->{share_owner}) |
| 46 |
|
|
-{ |
| 47 |
|
|
- my $statement = |
| 48 |
|
|
- "ALTER TABLE turba_shares CHANGE share_owner share_onwer ". |
| 49 |
|
|
- "VARCHAR(255)"; |
| 50 |
|
|
- $statement = $db_turbahandle->prepare($statement) or |
| 51 |
|
|
- die "prepare: $$statement: $DBI::errstr"; |
| 52 |
|
|
- $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 53 |
|
|
-} |
| 54 |
|
|
- |
| 55 |
|
|
- unless (defined $turba_shares_users->{user_uid}) |
| 56 |
|
|
-{ |
| 57 |
|
|
- my $statement = |
| 58 |
|
|
- "ALTER TABLE turba_shares_users CHANGE user_uid user_uid ". |
| 59 |
|
|
- "VARCHAR(255)"; |
| 60 |
|
|
- $statement = $db_turbahandle->prepare($statement) or |
| 61 |
|
|
- die "prepare: $$statement: $DBI::errstr"; |
| 62 |
|
|
- $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 63 |
|
|
-} |
| 64 |
|
|
- |
| 65 |
|
|
- unless (defined $turba_shares_groups->{group_uid}) |
| 66 |
|
|
-{ |
| 67 |
|
|
- my $statement = |
| 68 |
|
|
- "ALTER TABLE turba_shares_groups CHANGE group_uid group_uid ". |
| 69 |
|
|
- "VARCHAR(255)"; |
| 70 |
|
|
- $statement = $db_turbahandle->prepare($statement) or |
| 71 |
|
|
- die "prepare: $$statement: $DBI::errstr"; |
| 72 |
|
|
- $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 73 |
|
|
-} |
| 74 |
|
|
- |
| 75 |
|
|
# Create an index for owner_id if needed |
| 76 |
|
|
unless ($turba_objects->{owner_id}->{Key}) |
| 77 |
|
|
{ |
| 78 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.0.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/12hordeschema mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/12hordeschema |
| 79 |
|
|
--- e-smith-turba-3.0.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/12hordeschema 1969-12-31 18:00:00.000000000 -0600 |
| 80 |
|
|
+++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/12hordeschema 2009-10-08 21:05:57.000000000 -0500 |
| 81 |
|
|
@@ -0,0 +1 @@ |
| 82 |
|
|
++include /etc/openldap/schema/horde.schema |
| 83 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header |
| 84 |
|
|
--- e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header 2009-10-08 21:43:25.000000000 -0500 |
| 85 |
|
|
+++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header 2009-10-08 21:06:36.000000000 -0500 |
| 86 |
|
|
@@ -1,4 +1,4 @@ |
| 87 |
|
|
//00header |
| 88 |
|
|
/** |
| 89 |
|
|
- * $Horde: turba/config/sources.php.dist,v 1.97.6.38 2008/11/12 06:29:26 wrobel Exp $ |
| 90 |
|
|
+ * $Horde: turba/config/sources.php.dist,v 1.97.6.41 2009/08/05 21:06:10 jan Exp $ |
| 91 |
|
|
*/ |
| 92 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP |
| 93 |
|
|
--- e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2008-04-22 01:19:26.000000000 -0500 |
| 94 |
|
|
+++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2009-10-08 21:17:49.000000000 -0500 |
| 95 |
|
|
@@ -17,22 +17,41 @@ |
| 96 |
|
|
'port' => 389, |
| 97 |
|
|
'tls' => false, |
| 98 |
|
|
{ |
| 99 |
|
|
- my $domainName = $DomainName; |
| 100 |
|
|
- $domainName =~ s/\./,dc=/g; |
| 101 |
|
|
- $OUT = qq( 'root' => 'dc=$domainName',); |
| 102 |
|
|
+ #my $smeversion = $sysconfig{ReleaseVersion} || ""; |
| 103 |
|
|
+ my $domainName = $DomainName; |
| 104 |
|
|
+ $domainName =~ s/\./,dc=/g; |
| 105 |
|
|
+ # |
| 106 |
|
|
+ #if ($smeversion < '8') |
| 107 |
|
|
+ #{ |
| 108 |
|
|
+ $OUT = qq( 'root' => 'dc=$domainName',); |
| 109 |
|
|
+ #} else { |
| 110 |
|
|
+ # $OUT = qq( 'root' => 'ou=Users,dc=$domainName',); |
| 111 |
|
|
+ #} |
| 112 |
|
|
} |
| 113 |
|
|
// 'bind_dn' => 'cn=admin,ou=users,dc=example,dc=com', |
| 114 |
|
|
+// // For Active Directory: |
| 115 |
|
|
+// // 'bind_dn' => 'username@example.com', |
| 116 |
|
|
// 'bind_password' => '********', |
| 117 |
|
|
'sizelimit' => 200, |
| 118 |
|
|
+// // For Active Directory: |
| 119 |
|
|
+// // 'sizelimit' => 0, |
| 120 |
|
|
'dn' => array('cn'), |
| 121 |
|
|
'objectclass' => array('top', |
| 122 |
|
|
'person', |
| 123 |
|
|
'organizationalPerson', |
| 124 |
|
|
'inetOrgPerson', |
| 125 |
|
|
'turbaContact'), |
| 126 |
|
|
- // Add 'turbaContact' to this array if using |
| 127 |
|
|
- // 'turbaType' attribute below |
| 128 |
|
|
+ // Add 'turbaContact' to this array if using |
| 129 |
|
|
+ // 'turbaType' attribute below, and 'calEntry' |
| 130 |
|
|
+// // if using 'freebusyUrl'. |
| 131 |
|
|
+// // For Active Directory: |
| 132 |
|
|
+// // 'objectclass' => array('organizationalPerson', |
| 133 |
|
|
+// // 'user', |
| 134 |
|
|
+// // 'group', |
| 135 |
|
|
+// // 'contact'), |
| 136 |
|
|
'scope' => 'one', |
| 137 |
|
|
+// // For Active Directory: |
| 138 |
|
|
+// // 'scope' => 'sub', |
| 139 |
|
|
'charset' => 'UTF-8', |
| 140 |
|
|
// // Consult the LDAP schema to verify that all required attributes for |
| 141 |
|
|
// // an entry are set and add them if needed. |
| 142 |
|
|
@@ -43,10 +62,19 @@ |
| 143 |
|
|
// // field is assumed to have postalAddress syntax; otherwise the schema |
| 144 |
|
|
// // is consulted for the syntax to use. |
| 145 |
|
|
// 'checksyntax' => false, |
| 146 |
|
|
- 'version' => 3 |
| 147 |
|
|
+ 'version' => 3, |
| 148 |
|
|
+// |
| 149 |
|
|
+// // For Active Directory you probably want to also set the following |
| 150 |
|
|
+// // parameters: |
| 151 |
|
|
+// // 'deref' => LDAP_DEREF_ALWAYS, |
| 152 |
|
|
+// // 'filter' => '&(SAMAccountName=*)(mail=*)', |
| 153 |
|
|
+// // 'referrals' => 0, |
| 154 |
|
|
), |
| 155 |
|
|
'map' => array( |
| 156 |
|
|
'__key' => 'dn', |
| 157 |
|
|
+ |
| 158 |
|
|
+// // Remove this mapping if using Active Directory server: |
| 159 |
|
|
+// '__uid' => 'uid', |
| 160 |
|
|
'__uid' => 'uid', |
| 161 |
|
|
|
| 162 |
|
|
// // From horde.schema. Make sure you have 'turbaContact' objectClass |
| 163 |
|
|
@@ -59,14 +87,20 @@ |
| 164 |
|
|
'homePhone' => 'homephone', |
| 165 |
|
|
'workPhone' => 'telephonenumber', |
| 166 |
|
|
'cellPhone' => 'mobiletelephonenumber', |
| 167 |
|
|
- 'homeAddress' => 'homepostaladdress', |
| 168 |
|
|
+ 'homeAddress' => 'street', |
| 169 |
|
|
// |
| 170 |
|
|
// // From rfc2739.schema: |
| 171 |
|
|
{ |
| 172 |
|
|
my $hordefreebusy = $horde{'freebusy'} || 'disabled'; return " #freebusy is currently not enabled. To enable - config setprop horde freebusy enabled" unless ($hordefreebusy eq "enabled"); |
| 173 |
|
|
$OUT .= ' \'freebusyUrl\' => \'calFBURL\''; |
| 174 |
|
|
} |
| 175 |
|
|
-// // 'freebusyUrl' => 'calFBURL', |
| 176 |
|
|
+// |
| 177 |
|
|
+// // For Active Directory servers: |
| 178 |
|
|
+// // 'name' => 'displayname', |
| 179 |
|
|
+// // 'title' => 'title', |
| 180 |
|
|
+// // 'cellPhone' => 'mobile', |
| 181 |
|
|
+// // 'department' => 'department', |
| 182 |
|
|
+// // 'company' => 'company', |
| 183 |
|
|
), |
| 184 |
|
|
'search' => array( |
| 185 |
|
|
'name', |
| 186 |
|
|
@@ -82,6 +116,11 @@ |
| 187 |
|
|
'approximate' => array( |
| 188 |
|
|
'cn', |
| 189 |
|
|
), |
| 190 |
|
|
+// // For Active Directory servers: |
| 191 |
|
|
+// // 'approximate' => array( |
| 192 |
|
|
+// // 'displayname', |
| 193 |
|
|
+// // 'samaccountname', |
| 194 |
|
|
+// // ), |
| 195 |
|
|
'export' => true, |
| 196 |
|
|
'browse' => true, |
| 197 |
|
|
); |
Parent Directory
| 
Revision Log
| 
Revision Graph
