[packages/mysql/MYSQL_5_0] use existing (parent) dir for mysql certs

glen glen at pld-linux.org
Wed Jan 16 16:45:05 CET 2013


commit 1037ce3a24ffecaa47faf0af31117508800d9fff
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 16 17:39:00 2013 +0200

    use existing (parent) dir for mysql certs

 mysql.spec  | 4 ++--
 mysqld.conf | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index ce24a7f..8178da0 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -644,7 +644,7 @@ echo -e "all:\ninstall:\nclean:\nlink_sources:\n" > libmysqld/examples/Makefile
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql,ssl/certs/mysql,skel} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql,certs/mysql,skel} \
 	   $RPM_BUILD_ROOT/var/{log/{archive,}/mysql,lib/mysql} \
 	   $RPM_BUILD_ROOT{%{_infodir},%{_mysqlhome}}
 
@@ -883,7 +883,7 @@ EOF
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysql
 %attr(754,root,root) /etc/rc.d/init.d/mysql
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql
-%dir /etc/ssl/certs/mysql
+%dir /etc/certs/mysql
 %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/clusters.conf
 %attr(755,root,root) %{_sbindir}/innochecksum
 %attr(755,root,root) %{_sbindir}/my_print_defaults
diff --git a/mysqld.conf b/mysqld.conf
index 54ed928..80a4dfe 100644
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -14,9 +14,9 @@ port        = 3306
 user        = mysql
 
 # ssl options
-#ssl-ca = /etc/ssl/certs/mysql/ca-cert.pem
-#ssl-cert = /etc/ssl/certs/mysql/server-cert.pem
-#ssl-key = /etc/ssl/certs/mysql/server-key.pem
+#ssl-ca = /etc/certs/mysql/ca-cert.pem
+#ssl-cert = /etc/certs/mysql/server-cert.pem
+#ssl-key = /etc/certs/mysql/server-key.pem
 #ssl-cipher = DHE-RSA-AES256-SHA
 
 #character-set-server=latin2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/1037ce3a24ffecaa47faf0af31117508800d9fff



More information about the pld-cvs-commit mailing list