update SMF tools to use standard syncing script + webapp config address

Author: Vladimir Kotal

tools/init.d/opengrok.sh

@@ -1,4 +1,4 @@
-#! /bin/ksh
+#!/bin/ksh
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
@@ -16,10 +16,6 @@
 #
 # CDDL HEADER END
 
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-
-
 # The root direction of this opengrok installation
 ROOT=/opengrok; export ROOT
 # How often should the source be updated (in seconds)
@@ -39,8 +35,8 @@ PATH=/usr/bin; export PATH
 # The name of the web servers that should be notified with the information
 # of the active configuration to use. Specify them with hostname:port and
 # separate multiple hosts by space.
-# WEBSERVERS="server1:2424 server2:2424"
-# WEBSERVERS="localhost:2424"
+# WEBSERVERS="http://server1:8080/source http://server2:8080/source"
+# WEBSERVERS="http://localhost:8080/source"
 
 # The email address to send an email if the source update fails, or a fatal
 # error occurs while the index database is being updated.

tools/smf/indexer.sh

@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # See LICENSE.txt included in this distribution for the specific
@@ -34,7 +34,7 @@ send_report()
    if [ -n "${ADMINISTRATOR}" ]
    then
       mailx -s "{OpenGrok update failed" ${ADMINISTRATOR} < ${output}
-   fi   
+   fi
 }
 
 PROGDIR=${ROOT}/bin
@@ -47,7 +47,7 @@ do
 
    # update source code
    rm -f ${output}
-   ./smf/update_source.sh > ${output} 2>&1
+   ${PROGDIR}/sync.py -c ${SYNC_CONF} -d ${SRC_ROOT} > ${output} 2>&1
    if [ $? -ne 0 ]
    then
       send_report
@@ -92,7 +92,7 @@ do
 
             done
          fi
-  
+
          # update running configuration
          if [ "${stage}" = 1 ]
          then

tools/smf/opengrok.xml

@@ -19,7 +19,7 @@ CDDL HEADER END
 -->
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-  Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <service_bundle type="manifest" name="OSOLopengrok:opengrok">
@@ -68,14 +68,14 @@ CDDL HEADER END
           <propval name="action_authorization" type="astring" value="solaris.smf.manage.opengrok" />
           <propval name="value_authorization" type="astring" value="solaris.smf.value.opengrok" />
       </property_group>
-      
+
       <property_group  name="opengrok" type="application">
           <propval name="value_authorization" type="astring"
                    value="solaris.smf.value.opengrok" />
           <propval name="action_authorization" type="astring"
                    value="solaris.smf.manage.opengrok" />
-      </property_group>      
-      
+      </property_group>
+
       <instance name="opengrok" enabled="false">
          <exec_method
             type="method"
@@ -90,9 +90,8 @@ CDDL HEADER END
                    <!-- The root direction of this opengrok
                    installation -->
                    <envvar name="ROOT" value="/opengrok"/>
-                   
-                   <!-- How often should the source be updated (in
-                   seconds) -->
+
+                   <!-- How often should the source be updated (in seconds) -->
                    <envvar name="SLEEPTIME" value="1800"/>
 
                    <!-- The Java version to use -->
@@ -105,12 +104,15 @@ CDDL HEADER END
                    <envvar name="SUBVERSION" value="/usr/bin/svn"/>
                    <envvar name="MERCURIAL" value="/usr/bin/hg"/>
 
-                   <!-- The name of the web servers that should be
+                   <!-- The URI of the web servers that should be
                    notified with the information of the active
                    configuration to use. Specify them with
                    hostname:port and separate multiple hosts by space.
-                   ex: value="server1:2424 server2:2424" -->
-                   <envvar name="WEBSERVERS" value="localhost:2424"/>
+                   ex: value="http://server1:8080/source http://server2:8080" -->
+                   <envvar name="WEBSERVERS" value="http://localhost:8080/source"/>
+
+                   <!-- path to sync.py configuration file -->
+                   <envvar name="SYNC_CONF" value="/opengrok/etc/sync.conf"/>
 
                    <!-- The email address to send an email if the
                    source update fails, or a fatal error occurs while
@@ -124,7 +126,7 @@ CDDL HEADER END
                </method_environment>
             </method_context>
          </exec_method>
-   
+
          <exec_method
             type="method"
             name="stop"
@@ -134,7 +136,7 @@ CDDL HEADER END
       </instance>
 
       <stability value="Unstable" />
-         
+
       <template>
          <common_name>
             <loctext xml:lang="C">OpenGrok indexing service</loctext>