Date: Wed, 24 Apr 2013 15:08:22 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316439 - in head/databases: mysql55-server/files mysql56-server/files Message-ID: <201304241508.r3OF8MCT082012@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Wed Apr 24 15:08:22 2013 New Revision: 316439 URL: http://svnweb.freebsd.org/changeset/ports/316439 Log: Allow to specify server-specific option file path in /etc/rc.conf PR: ports/172408 Submitted by: Daniel Ylitalo <daniel@produktion203.se> Modified: head/databases/mysql55-server/files/mysql-server.in head/databases/mysql56-server/files/mysql-server.in Modified: head/databases/mysql55-server/files/mysql-server.in ============================================================================== --- head/databases/mysql55-server/files/mysql-server.in Wed Apr 24 14:21:12 2013 (r316438) +++ head/databases/mysql55-server/files/mysql-server.in Wed Apr 24 15:08:22 2013 (r316439) @@ -16,6 +16,8 @@ # just before mysql starts. # mysql_dbdir (str): Default to "/var/db/mysql" # Base database directory. +# mysql_optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". # mysql_pidfile (str): Custum PID file path and name. # Default to "${mysql_dbdir}/${hostname}.pid". # mysql_args (str): Custom additional arguments to be passed @@ -32,12 +34,13 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} +: ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" Modified: head/databases/mysql56-server/files/mysql-server.in ============================================================================== --- head/databases/mysql56-server/files/mysql-server.in Wed Apr 24 14:21:12 2013 (r316438) +++ head/databases/mysql56-server/files/mysql-server.in Wed Apr 24 15:08:22 2013 (r316439) @@ -16,6 +16,8 @@ # just before mysql starts. # mysql_dbdir (str): Default to "/var/db/mysql" # Base database directory. +# mysql_optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". # mysql_pidfile (str): Custum PID file path and name. # Default to "${mysql_dbdir}/${hostname}.pid". # mysql_args (str): Custom additional arguments to be passed @@ -32,12 +34,13 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} +: ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304241508.r3OF8MCT082012>