[pkgsrc/trunk]: pkgsrc/databases Add SMF manifest. Move rc.d script to openl...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe07f7c86f17
branches:  trunk
changeset: 348654:fe07f7c86f17
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jun 17 13:56:53 2016 +0000

description:
Add SMF manifest.  Move rc.d script to openldap-server files directory
for consistency and avoid redundant FILESDIR shared between packages.

diffstat:

 databases/openldap-server/files/slapd.sh         |  19 ++++++++++++
 databases/openldap-server/files/smf/manifest.xml |  36 ++++++++++++++++++++++++
 databases/openldap/Makefile.common               |   3 +-
 databases/openldap/files/slapd.sh                |  19 ------------
 4 files changed, 56 insertions(+), 21 deletions(-)

diffs (103 lines):

diff -r 118fcb9ce63f -r fe07f7c86f17 databases/openldap-server/files/slapd.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap-server/files/slapd.sh  Fri Jun 17 13:56:53 2016 +0000
@@ -0,0 +1,19 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: slapd.sh,v 1.1 2016/06/17 13:56:53 jperkin Exp $
+#
+# OpenLDAP standalone LDAP daemon
+#
+# PROVIDE: slapd
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="slapd"
+rcvar=${name}
+command="@PREFIX@/libexec/${name}"
+required_files="@OPENLDAP_ETCDIR@/${name}.conf"
+command_args="-u @SLAPD_USER@"
+
+load_rc_config $name
+run_rc_command "$1"
diff -r 118fcb9ce63f -r fe07f7c86f17 databases/openldap-server/files/smf/manifest.xml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap-server/files/smf/manifest.xml  Fri Jun 17 13:56:53 2016 +0000
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='export'>
+  <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='0'>
+    <create_default_instance enabled='false'/>
+    <single_instance/>
+    <dependency name='network' grouping='require_all' restart_on='error' type='service'>
+      <service_fmri value='svc:/milestone/network:default'/>
+    </dependency>
+    <dependency name='filesystem-local' grouping='require_all' restart_on='error' type='service'>
+      <service_fmri value='svc:/system/filesystem/local:default'/>
+    </dependency>
+    <method_context working_directory='@OPENLDAP_VARDIR@'>
+      <method_environment>
+        <envvar name='PATH' value='@PREFIX@/sbin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/bin'/>
+      </method_environment>
+    </method_context>
+    <exec_method name='start' type='method' exec='@PREFIX@/libexec/slapd -u @SLAPD_USER@ -g @LDAP_GROUP@ -h &quot;ldap:// ldaps://&quot; -f %{config_file}' timeout_seconds='60'/>
+    <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
+    <property_group name='startd' type='framework'>
+      <propval name='ignore_error' type='astring' value='core,signal'/>
+    </property_group>
+    <property_group name='application' type='application'>
+      <propval name='config_file' type='astring' value='@PKG_SYSCONFDIR@/openldap/slapd.conf'/>
+    </property_group>
+    <template>
+      <common_name>
+        <loctext xml:lang='C'>OpenLDAP Server</loctext>
+      </common_name>
+      <documentation>
+        <manpage title='slapd.conf' section='5' manpath='@PREFIX@/@PKGMANDIR@'/>
+        <manpage title='slapd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
+      </documentation>
+    </template>
+  </service>
+</service_bundle>
diff -r 118fcb9ce63f -r fe07f7c86f17 databases/openldap/Makefile.common
--- a/databases/openldap/Makefile.common        Fri Jun 17 13:01:29 2016 +0000
+++ b/databases/openldap/Makefile.common        Fri Jun 17 13:56:53 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2016/02/25 11:46:21 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.38 2016/06/17 13:56:53 jperkin Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -29,7 +29,6 @@
 
 DISTINFO_FILE=         ${.CURDIR}/../../databases/openldap/distinfo
 PATCHDIR=              ${.CURDIR}/../../databases/openldap/patches
-FILESDIR=              ${.CURDIR}/../../databases/openldap/files
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            soelim
diff -r 118fcb9ce63f -r fe07f7c86f17 databases/openldap/files/slapd.sh
--- a/databases/openldap/files/slapd.sh Fri Jun 17 13:01:29 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: slapd.sh,v 1.8 2006/05/31 18:17:49 ghen Exp $
-#
-# OpenLDAP standalone LDAP daemon
-#
-# PROVIDE: slapd
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="slapd"
-rcvar=${name}
-command="@PREFIX@/libexec/${name}"
-required_files="@OPENLDAP_ETCDIR@/${name}.conf"
-command_args="-u @SLAPD_USER@"
-
-load_rc_config $name
-run_rc_command "$1"