use existing (parent) dir for mysql certs

diff --git a/mysql.spec b/mysql.spec
index ce24a7fbdc0c7463deb0e392b1e0811dd64eee74..8178da0138a86aa94dbcc8650ea72a10373d1a69 100644 (file)
--- 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 54ed928f633567003adaa6ab6bb8f1934125cd11..80a4dfecb2836ab116cd9acfb872134fd412c4ee 100644 (file)
--- 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