/[smecontribs]/rpms/smeserver-mysql57/contribs9/smeserver-mysql57-2.0.0-SME10145-phmyadminFragment.patch
ViewVC logotype

Contents of /rpms/smeserver-mysql57/contribs9/smeserver-mysql57-2.0.0-SME10145-phmyadminFragment.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Sun Mar 12 20:11:07 2017 UTC (7 years, 8 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-mysql57-2_0_0-12_el6_sme, smeserver-mysql57-2_0_0-9_el6_sme, smeserver-mysql57-2_0_0-11_el6_sme, smeserver-mysql57-2_0_0-6_el6_sme, smeserver-mysql57-2_0_0-4_el6_sme, smeserver-mysql57-2_0_0-7_el6_sme, smeserver-mysql57-2_0_0-8_el6_sme, smeserver-mysql57-2_0_0-5_el6_sme, smeserver-mysql57-2_0_0-10_el6_sme, HEAD 
* Sun Mar 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.0.0-4.sme
- fix conflict with mysql55 phpmyadmin fragment [SME: 10145]
1 diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config
2 --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config 2017-02-19 09:44:53.000000000 -0500
3 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config 1969-12-31 19:00:00.000000000 -0500
4 @@ -1,85 +0,0 @@
5 -
6 -/* Server MYSQL57 localhost (config:root) [1] */
7 -$i++;
8 -$cfg['Servers'][$i]['host'] = 'localhost';
9 -$cfg['Servers'][$i]['extension'] = 'mysql';
10 -$cfg['Servers'][$i]['connect_type'] = 'socket';
11 -$cfg['Servers'][$i]['socket'] = '/var/lib/mysql/mysql57.sock';
12 -$cfg['Servers'][$i]['compress'] = false;
13 -# standalone or login mode
14 -$scriptname=end(explode('/',$_SERVER['PHP_SELF']));
15 -$scriptpath=str_replace($scriptname,"",$_SERVER['PHP_SELF']);
16 -# standalone login part
17 -{
18 -my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
19 -my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
20 -if (("$adminaccess" eq "enabled"))
21 - {
22 - $OUT .="if (\$scriptpath==\"/phpmyadmin/\" && \$_SERVER['PHP_AUTH_USER']=='admin')\n";
23 - $OUT .="{\n";
24 - $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'config';\n";
25 - $OUT .="\$cfg['Servers'][\$i]['user'] = 'root';\n";
26 - open (PW, "/etc/openldap/ldap.pw")
27 - || die "Could not read LDAP password.\n";
28 - my $pw = <PW>;
29 - chomp ($pw);
30 - close PW;
31 - $OUT .="\$cfg['Servers'][\$i]['password'] = '$pw';\n";
32 - $OUT .="}";
33 - }
34 -else
35 - {
36 - $OUT .="# standelaone admin configuration disabled";
37 - }
38 -}
39 -# end of standalone login part
40 -# multiuser login part
41 -{
42 -my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
43 -my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
44 - $OUT .="\n";
45 -if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
46 - {
47 - $OUT .="if (\$scriptpath==\"/phpmyadmin-multi/\")\n";
48 - $OUT .="{\n";
49 - }
50 -if (("$multiaccess" eq "enabled"))
51 - {
52 - $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'cookie';\n";
53 - my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
54 - $OUT .="\$cfg['blowfish_secret'] = '$secret';\n";
55 - }
56 -else
57 - {
58 - $OUT .="# multiuser disabled\n";
59 - }
60 -if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
61 - {
62 - $OUT .="}\n";
63 - }
64 -}
65 -# end of multiuser login part
66 -$cfg['Servers'][$i]['controluser'] = "";
67 -$cfg['Servers'][$i]['controlpass'] = "";
68 -$cfg['Servers'][$i]['only_db'] = "";
69 -$cfg['Servers'][$i]['hide_db'] = "";
70 -$cfg['Servers'][$i]['verbose'] = 'Mysql57';// here is the name as it appears in phpmyadmin
71 -$cfg['Servers'][$i]['pmadb'] = "";
72 -$cfg['Servers'][$i]['bookmarktable'] = "";
73 -$cfg['Servers'][$i]['relation'] = "";
74 -$cfg['Servers'][$i]['table_info'] = "";
75 -$cfg['Servers'][$i]['table_coords'] = "";
76 -$cfg['Servers'][$i]['pdf_pages'] = "";
77 -$cfg['Servers'][$i]['column_info'] = "";
78 -$cfg['Servers'][$i]['history'] = "";
79 -$cfg['Servers'][$i]['verbose_check'] = TRUE;
80 -$cfg['Servers'][$i]['AllowRoot'] = TRUE;
81 -$cfg['Servers'][$i]['AllowDeny']['order']="";
82 -$cfg['Servers'][$i]['AllowDeny']['rules']= array();
83 -$cfg['Servers'][$i]['AllowNoPassword']= FALSE;
84 -$cfg['Servers'][$i]['designer_coords']= "";
85 -$cfg['Servers'][$i]['bs_garbage_threshold']= 50;
86 -$cfg['Servers'][$i]['bs_repository_threshold']= '32M';
87 -$cfg['Servers'][$i]['bs_temp_blob_timeout']= 600;
88 -$cfg['Servers'][$i]['bs_temp_log_threshold']= '32M';
89 -
90 diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql57 smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql57
91 --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql57 1969-12-31 19:00:00.000000000 -0500
92 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql57 2017-02-19 09:44:53.000000000 -0500
93 @@ -0,0 +1,85 @@
94 +
95 +/* Server MYSQL57 localhost (config:root) [1] */
96 +$i++;
97 +$cfg['Servers'][$i]['host'] = 'localhost';
98 +$cfg['Servers'][$i]['extension'] = 'mysql';
99 +$cfg['Servers'][$i]['connect_type'] = 'socket';
100 +$cfg['Servers'][$i]['socket'] = '/var/lib/mysql/mysql57.sock';
101 +$cfg['Servers'][$i]['compress'] = false;
102 +# standalone or login mode
103 +$scriptname=end(explode('/',$_SERVER['PHP_SELF']));
104 +$scriptpath=str_replace($scriptname,"",$_SERVER['PHP_SELF']);
105 +# standalone login part
106 +{
107 +my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
108 +my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
109 +if (("$adminaccess" eq "enabled"))
110 + {
111 + $OUT .="if (\$scriptpath==\"/phpmyadmin/\" && \$_SERVER['PHP_AUTH_USER']=='admin')\n";
112 + $OUT .="{\n";
113 + $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'config';\n";
114 + $OUT .="\$cfg['Servers'][\$i]['user'] = 'root';\n";
115 + open (PW, "/etc/openldap/ldap.pw")
116 + || die "Could not read LDAP password.\n";
117 + my $pw = <PW>;
118 + chomp ($pw);
119 + close PW;
120 + $OUT .="\$cfg['Servers'][\$i]['password'] = '$pw';\n";
121 + $OUT .="}";
122 + }
123 +else
124 + {
125 + $OUT .="# standelaone admin configuration disabled";
126 + }
127 +}
128 +# end of standalone login part
129 +# multiuser login part
130 +{
131 +my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
132 +my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
133 + $OUT .="\n";
134 +if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
135 + {
136 + $OUT .="if (\$scriptpath==\"/phpmyadmin-multi/\")\n";
137 + $OUT .="{\n";
138 + }
139 +if (("$multiaccess" eq "enabled"))
140 + {
141 + $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'cookie';\n";
142 + my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
143 + $OUT .="\$cfg['blowfish_secret'] = '$secret';\n";
144 + }
145 +else
146 + {
147 + $OUT .="# multiuser disabled\n";
148 + }
149 +if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
150 + {
151 + $OUT .="}\n";
152 + }
153 +}
154 +# end of multiuser login part
155 +$cfg['Servers'][$i]['controluser'] = "";
156 +$cfg['Servers'][$i]['controlpass'] = "";
157 +$cfg['Servers'][$i]['only_db'] = "";
158 +$cfg['Servers'][$i]['hide_db'] = "";
159 +$cfg['Servers'][$i]['verbose'] = 'Mysql57';// here is the name as it appears in phpmyadmin
160 +$cfg['Servers'][$i]['pmadb'] = "";
161 +$cfg['Servers'][$i]['bookmarktable'] = "";
162 +$cfg['Servers'][$i]['relation'] = "";
163 +$cfg['Servers'][$i]['table_info'] = "";
164 +$cfg['Servers'][$i]['table_coords'] = "";
165 +$cfg['Servers'][$i]['pdf_pages'] = "";
166 +$cfg['Servers'][$i]['column_info'] = "";
167 +$cfg['Servers'][$i]['history'] = "";
168 +$cfg['Servers'][$i]['verbose_check'] = TRUE;
169 +$cfg['Servers'][$i]['AllowRoot'] = TRUE;
170 +$cfg['Servers'][$i]['AllowDeny']['order']="";
171 +$cfg['Servers'][$i]['AllowDeny']['rules']= array();
172 +$cfg['Servers'][$i]['AllowNoPassword']= FALSE;
173 +$cfg['Servers'][$i]['designer_coords']= "";
174 +$cfg['Servers'][$i]['bs_garbage_threshold']= 50;
175 +$cfg['Servers'][$i]['bs_repository_threshold']= '32M';
176 +$cfg['Servers'][$i]['bs_temp_blob_timeout']= 600;
177 +$cfg['Servers'][$i]['bs_temp_log_threshold']= '32M';
178 +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed