Merge lp:~trond-norbye/drizzle/smf-integration into lp:~drizzle-trunk/drizzle/development

[Trond Norbye]

[Trond Norbye (trond-norbye)]

Added configuration files (and a script to install them) needed to run drizzle as a service in SMF.

[lp:~trond-norbye/drizzle/smf-integration]

1027. By Trond Norbye on 2009-05-18

Remove output from ed during smf install

=== modified file '.bzrignore'
--- .bzrignore	2009-05-07 21:25:23 +0000
+++ .bzrignore	2009-05-18 17:46:43 +0000
@@ -36,6 +36,10 @@
 strings/Makefile.in
 strings/tests/Makefile.in
 support-files/Makefile.in
+support-files/smf/Makefile.in
+support-files/smf/install.sh
+support-files/smf/drizzle
+support-files/smf/drizzle.xml
 tests/Makefile.in
 unittest/Makefile.in
 unittest/examples/Makefile.in

=== modified file 'configure.ac'
--- configure.ac	2009-05-14 06:01:02 +0000
+++ configure.ac	2009-05-18 17:46:43 +0000
@@ -1453,7 +1453,11 @@
  support-files/Makefile dnl
  tests/Makefile tests/install_test_db dnl
  drizzled/drizzled_safe dnl
- support-files/drizzle.server support-files/drizzle-log-rotate)
+ support-files/drizzle.server support-files/drizzle-log-rotate
+ support-files/smf/Makefile dnl
+ support-files/smf/install.sh dnl
+ support-files/smf/drizzle.xml dnl
+ support-files/smf/drizzle)
 
 scheduling_plugins_available="
   pool_of_threads 

=== modified file 'support-files/Makefile.am'
--- support-files/Makefile.am	2009-04-07 08:32:11 +0000
+++ support-files/Makefile.am	2009-05-18 17:46:43 +0000
@@ -15,6 +15,8 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
+SUBDIRS = smf
+
 pkgconfigdir = $(libdir)/pkgconfig
 
 # Default same as 'pkgdatadir', but we can override it

=== added directory 'support-files/smf'
=== added file 'support-files/smf/Makefile.am'
--- support-files/smf/Makefile.am	1970-01-01 00:00:00 +0000
+++ support-files/smf/Makefile.am	2009-05-18 17:46:43 +0000
@@ -0,0 +1,16 @@
+#  Copyright (C) 2009 Sun Microsystems
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+EXTRA_DIST= install.sh drizzle.xml drizzle

=== added file 'support-files/smf/drizzle.in'
--- support-files/smf/drizzle.in	1970-01-01 00:00:00 +0000
+++ support-files/smf/drizzle.in	2009-05-18 17:46:43 +0000
@@ -0,0 +1,41 @@
+#!/sbin/sh
+#  Copyright (C) 2009 Sun Microsystems
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+. /lib/svc/share/smf_include.sh
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datadir=`svcprop -p drizzle/datadir $SMF_FMRI`
+
+case "$1" in
+   'start')
+      /bin/coreadm -p "`svcprop -p drizzle/corepattern $SMF_FMRI`" $$
+      @sbindir@/drizzled --datadir=`eval echo ${datadir}` \
+                        --port=`svcprop -p drizzle/port $SMF_FMRI`  \
+                        --skip-stack-trace &
+   ;;
+
+   'stop')
+      smf_kill_contract $2 TERM 1
+   ;;
+
+   *)
+      echo "Usage: $0 {start|stop}"
+      exit 1
+;;
+esac
+
+exit $SMF_EXIT_OK

=== added file 'support-files/smf/drizzle.xml.in'
--- support-files/smf/drizzle.xml.in	1970-01-01 00:00:00 +0000
+++ support-files/smf/drizzle.xml.in	2009-05-18 17:46:43 +0000
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  Copyright (C) 2009 Sun Microsystems
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="drizzle">
+    <service name="application/database/drizzle" type="service" version="1">
+        <single_instance/>
+
+        <dependency name="multi-user-server" grouping="require_all" restart_on="none" type="service">
+            <service_fmri value="svc:/milestone/multi-user-server" />
+        </dependency>
+
+        
+        <!-- We need to map the name of the authorizations we defined to this service -->
+        <property_group name="general" type="framework">
+            <propval name="action_authorization" type="astring" 
+                     value="solaris.smf.manage.drizzle" />
+            <propval name="value_authorization" type="astring" 
+                     value="solaris.smf.value.drizzle" />
+        </property_group>
+
+
+        <property_group name="drizzle" type="application">
+            <propval name="datadir" type="astring" 
+                     value="@localstatedir@/data" />
+            <propval name="corepattern" type="astring" 
+                     value="@localstatedir@/crash/core.%f.%p" />
+            <propval name="port" type="astring" 
+                     value="4427" />
+        </property_group>
+
+        <!-- Define the instance and how to start / stop it -->
+        <instance name="drizzle" enabled="false">
+            <exec_method type="method" name="start" exec="/lib/svc/method/drizzle start" timeout_seconds="30" >
+                <method_context>
+                    <method_credential user="drizzled" group="drizzled" />
+                </method_context>
+            </exec_method>
+            <exec_method type="method" name="stop" exec="/lib/svc/method/drizzle stop  %{restarter/contract}" timeout_seconds="60" >
+                <method_context>
+                    <method_credential user="drizzled" group="drizzled" />
+                </method_context>
+            </exec_method>
+        </instance>
+        
+
+       <stability value="Unstable" />
+        <template>
+            <common_name>
+                <loctext xml:lang="C">Drizzle database server</loctext>
+            </common_name>
+            <documentation>
+                <manpage title="drizzle" section="1" manpath="@prefix@/share/man" />
+            </documentation>
+        </template>
+    </service>
+</service_bundle>

=== added file 'support-files/smf/install.sh.in'
--- support-files/smf/install.sh.in	1970-01-01 00:00:00 +0000
+++ support-files/smf/install.sh.in	2009-05-18 17:46:43 +0000
@@ -0,0 +1,103 @@
+#! /bin/pfsh
+#  Copyright (C) 2009 Sun Microsystems
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+
+grep solaris.smf.value.drizzle /etc/security/auth_attr > /dev/null
+if [ $? -ne 0 ]
+then
+  ed /etc/security/auth_attr <<EOF
+a
+solaris.smf.value.drizzle:::Change Drizzle value properties::
+solaris.smf.manage.drizzle:::Manage Drizzle service states::
+.
+w
+q
+EOF
+  if [ $? -ne 0 ]
+  then
+    echo "Failed to add authorization definitions"
+    exit 1
+  fi
+fi
+
+grep solaris.smf.manage.drizzle /etc/security/prof_attr > /dev/null
+if [ $? -ne 0 ]
+then
+  ed /etc/security/prof_attr <<EOF
+a
+Drizzle Administration::::auths=solaris.smf.manage.drizzle,solaris.smf.value.drizzle
+.
+w
+q
+EOF
+
+  if [ $? -ne 0 ]
+  then
+    echo "Failed to add profile definitions"
+    exit 1
+  fi
+fi
+
+getent group drizzled > /dev/null
+if [ $? -ne 0 ]
+then
+  groupadd drizzled
+  if [ $? -ne 0 ]
+  then
+    echo "Failed to create group drizzled"
+    exit 1
+  fi
+fi
+
+getent passwd drizzled > /dev/null
+if [ $? -ne 0 ]
+then
+  roleadd -c "Drizzle daemon" -d @localstatedir@ -g drizzled \
+          -A solaris.smf.value.drizzle,solaris.smf.manage.drizzle drizzled
+  if [ $? -ne 0 ]
+  then
+    echo "Failed to create role drizzled"
+    exit 1
+  fi
+
+  mkdir -p @localstatedir@/data
+  mkdir -p @localstatedir@/crash
+  chown -R drizzled:drizzled @localstatedir@
+fi
+
+/usr/sbin/install -f /lib/svc/method drizzle
+if [ $? -ne 0 ]
+then
+  echo "Failed to install smf startup script"
+  exit 1
+fi
+
+/usr/sbin/install -f /var/svc/manifest/application -m 0444 drizzle.xml
+if [ $? -ne 0 ]
+then
+  echo "Failed to install smf definition"
+  exit 1
+fi
+
+svccfg import /var/svc/manifest/application/drizzle.xml
+if [ $? -ne 0 ]
+then
+  echo "Failed to import smf definition"
+  exit 1
+fi
+