CVS commit: pkgsrc/databases

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 17 13:56:53 UTC 2016

Modified Files:
        pkgsrc/databases/openldap: Makefile.common
Added Files:
        pkgsrc/databases/openldap-server/files: slapd.sh
        pkgsrc/databases/openldap-server/files/smf: manifest.xml
Removed Files:
        pkgsrc/databases/openldap/files: slapd.sh

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


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/databases/openldap/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/openldap-server/files/slapd.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/openldap-server/files/smf/manifest.xml
cvs rdiff -u -r1.8 -r0 pkgsrc/databases/openldap/files/slapd.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/openldap/Makefile.common
diff -u pkgsrc/databases/openldap/Makefile.common:1.37 pkgsrc/databases/openldap/Makefile.common:1.38
--- pkgsrc/databases/openldap/Makefile.common:1.37      Thu Feb 25 11:46:21 2016
+++ pkgsrc/databases/openldap/Makefile.common   Fri Jun 17 13:56:53 2016
@@ -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 @@ CONFLICTS+=           ldapsdk-[0-9]*
 
 DISTINFO_FILE=         ${.CURDIR}/../../databases/openldap/distinfo
 PATCHDIR=              ${.CURDIR}/../../databases/openldap/patches
-FILESDIR=              ${.CURDIR}/../../databases/openldap/files
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            soelim

Added files:

Index: pkgsrc/databases/openldap-server/files/slapd.sh
diff -u /dev/null pkgsrc/databases/openldap-server/files/slapd.sh:1.1
--- /dev/null   Fri Jun 17 13:56:53 2016
+++ pkgsrc/databases/openldap-server/files/slapd.sh     Fri Jun 17 13:56:53 2016
@@ -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"

Index: pkgsrc/databases/openldap-server/files/smf/manifest.xml
diff -u /dev/null pkgsrc/databases/openldap-server/files/smf/manifest.xml:1.1
--- /dev/null   Fri Jun 17 13:56:53 2016
+++ pkgsrc/databases/openldap-server/files/smf/manifest.xml     Fri Jun 17 13:56:53 2016
@@ -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>