--- a/components/mysql-5-1/Solaris/mysql_51.xml Wed Nov 20 15:46:14 2013 +0100
+++ b/components/mysql-5-1/Solaris/mysql_51.xml Thu Jan 09 22:44:58 2014 -0800
@@ -2,7 +2,7 @@
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
CDDL HEADER START
@@ -30,7 +30,6 @@
-->
<service_bundle type='manifest' name='mysql'>
-
<service
name='application/database/mysql'
type='service'
@@ -58,62 +57,82 @@
<service_fmri value='svc:/system/filesystem/local:default' />
</dependency>
- <exec_method
- type='method'
- name='start'
- exec='/lib/svc/method/mysql_51 start'
- timeout_seconds='60' />
-
+ <instance name='version_51' enabled='false'>
+ <method_context working_directory='/var/mysql'>
+ <method_credential user='mysql' group='mysql' />
+ </method_context>
- <exec_method
- type='method'
- name='stop'
- exec='/lib/svc/method/mysql_51 stop'
- timeout_seconds='60' />
+ <exec_method
+ type='method'
+ name='start'
+ exec='/lib/svc/method/mysql_51 start'
+ timeout_seconds='60' />
-
-
+ <exec_method
+ type='method'
+ name='stop'
+ exec='/lib/svc/method/mysql_51 stop %{restarter/contract}'
+ timeout_seconds='60' />
- <instance name='version_51' enabled='false'>
-
- <method_context working_directory='/var/mysql'>
- <method_credential user='mysql' group='mysql' />
- </method_context>
-
+ <!--
+ refresh method for this service is not defined
+ because mysqld by itself cannot accept a HUP signal to
+ reload the configuration file my.cnf
+ -->
+
<property_group name='mysql' type='application'>
- <propval name='bin' type='astring'
- value='/usr/mysql/5.1/bin' />
+ <propval name='cnf' type='astring'
+ value='/etc/mysql/5.1/my.cnf' />
+ <propval name='bin' type='astring'
+ value='/usr/mysql/5.1/bin' />
<propval name='data' type='astring'
- value='/var/mysql/5.1/data' />
- <propval name='value_authorization' type='astring'
- value='solaris.smf.value.mysql/version_51' />
- <propval name='action_authorization' type='astring'
- value='solaris.smf.manage.mysql/version_51' />
- <propval name='enable_64bit' type='boolean' value='false' />
- </property_group>
+ value='/var/mysql/5.1/data' />
+ <propval name='enable_64bit' type='boolean'
+ value='false' />
+ <property name='value_authorization' type='astring'>
+ <astring_list>
+ <value_node value='solaris.smf.value.mysql' />
+ <value_node value='solaris.smf.value.mysql/version_51' />
+ </astring_list>
+ </property>
+ <property name='action_authorization' type='astring'>
+ <astring_list>
+ <value_node value='solaris.smf.manage.mysql' />
+ <value_node value='solaris.smf.manage.mysql/version_51' />
+ </astring_list>
+ </property>
+ </property_group>
<property_group name='general' type='framework'>
- <propval name='action_authorization' type='astring' value='solaris.smf.manage.mysql/version_51' />
- <propval name='value_authorization' type='astring' value='solaris.smf.value.mysql/version_51' />
+ <property name='action_authorization' type='astring'>
+ <astring_list>
+ <value_node value='solaris.smf.manage.mysql' />
+ <value_node value='solaris.smf.manage.mysql/version_51' />
+ </astring_list>
+ </property>
+ <property name='value_authorization' type='astring'>
+ <astring_list>
+ <value_node value='solaris.smf.value.mysql' />
+ <value_node value='solaris.smf.value.mysql/version_51' />
+ </astring_list>
+ </property>
</property_group>
- </instance>
+
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>
+ MySQL Database Management System
+ </loctext>
+ </common_name>
+
+ <documentation>
+ <manpage title='MySQL 5.1' section='1' />
+ <doc_link name='mysql.com'
+ uri='http://dev.mysql.com/doc' />
+ </documentation>
+ </template>
+ </instance>
<stability value='Evolving' />
-
- <template>
- <common_name>
- <loctext xml:lang='C'>
- MySQL RDBMS
- </loctext>
- </common_name>
- <documentation>
- <manpage title='MySQL 5.1.37' section='1' />
- <doc_link name='mysql.com'
- uri='http://dev.mysql.com/doc' />
- </documentation>
- </template>
-
</service>
-
</service_bundle>
-