cherokee at cherokee-project
Jul 5, 2009, 1:11 AM
Post #1 of 1
(150 views)
Permalink
|
|
[3424] cherokee/trunk: Improves the OpenSolaris (& S10) SMF support.
|
|
Revision: 3424
http://svn.cherokee-project.com/changeset/3424
Author: alo
Date: 2009-07-05 10:11:47 +0200 (Sun, 05 Jul 2009)
Log Message:
-----------
Improves the OpenSolaris (& S10) SMF support. Thanks to Miguel Vidal
<mvidal[at]libresoft.es> for sending a patch fixing the exec_method's
start property. Additionally, this patch renames the .xml to .xml.pre
so the paths are rewritten according to the real installation paths.
Modified Paths:
--------------
cherokee/trunk/Makefile.am
cherokee/trunk/configure.in
Added Paths:
-----------
cherokee/trunk/http-cherokee.xml.pre
Removed Paths:
-------------
cherokee/trunk/http-cherokee.xml
Modified: cherokee/trunk/Makefile.am
===================================================================
--- cherokee/trunk/Makefile.am 2009-07-03 14:45:20 UTC (rev 3423)
+++ cherokee/trunk/Makefile.am 2009-07-05 08:11:47 UTC (rev 3424)
@@ -1,7 +1,7 @@
## Cherokee: Makefile.am -*- makefile -*-
SUBDIRS = po m4 www icons themes qa doc . admin contrib cherokee cget windows dbslayer
-SUFFIXES = .sample.pre .sample .h.pre .h
+SUFFIXES = .sample.pre .sample .h.pre .h .xml.pre .xml
ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = cherokee-config
@@ -30,15 +30,15 @@
sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g; s|%libdir%|${libdir}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
.sample.pre.sample:
sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g; s|%libdir%|${libdir}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
+.xml.pre.xml:
+ sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g; s|%libdir%|${libdir}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
-
CONSTANTS_PRE = \
constants.h.pre
CONSTANTS = \
$(CONSTANTS_PRE:.h.pre=.h)
-
CONFS_PRE = \
cherokee.conf.sample.pre \
performance.conf.sample.pre
@@ -46,10 +46,18 @@
CONFS = \
$(CONFS_PRE:.sample.pre=.sample)
+XMLS_PRE = \
+http-cherokee.xml.pre
+
+XMLS = \
+$(XMLS_PRE:.xml.pre=.xml)
+
+
WINDOWS_PORT_FILES = \
config.h.win32
CLEANFILES = \
+$(XMLS) \
$(CONFS) \
$(CONSTANTS)
@@ -71,13 +79,14 @@
svnlog2changelog.py \
changelog-update.sh \
$(m4data_DATA) \
+$(XMLS_PRE) \
$(CONFS_PRE) \
$(CONSTANTS_PRE) \
$(man_MANS) \
$(WINDOWS_PORT_FILES) \
$(COMPILATION_TESTS)
-all-local: $(CONSTANTS) $(CONFS)
+all-local: $(CONSTANTS) $(CONFS) $(XMLS)
install-data-local-config:
@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
Modified: cherokee/trunk/configure.in
===================================================================
--- cherokee/trunk/configure.in 2009-07-03 14:45:20 UTC (rev 3423)
+++ cherokee/trunk/configure.in 2009-07-05 08:11:47 UTC (rev 3424)
@@ -1295,9 +1295,9 @@
AM_CONDITIONAL(INSTALL_ADMIN, test "x$wants_admin" != "xno")
dnl
-dnl Clean the .pre files
+dnl Clean files generated from *.pre
dnl
-pres="constants.h cherokee.conf.sample performance.conf.sample admin/configured.py contrib/cherokee"
+pres="constants.h cherokee.conf.sample performance.conf.sample http-cherokee.xml admin/configured.py contrib/cherokee"
AC_MSG_NOTICE([Deleting .pre files])
rm -f $pres
Deleted: cherokee/trunk/http-cherokee.xml
===================================================================
--- cherokee/trunk/http-cherokee.xml 2009-07-03 14:45:20 UTC (rev 3423)
+++ cherokee/trunk/http-cherokee.xml 2009-07-05 08:11:47 UTC (rev 3424)
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
-
- Cherokee
-
- Authors:
- Rodrigo Fernandez-Vizarra <rodrigo.fernandez-vizarra[at]sun.com>
-
- Copyright (C) 2006-2007 Alvaro Lopez Ortega
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of version 2 of the GNU General Public
- License as published by the Free Software Foundation.
-
- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
--->
-
-<service_bundle type='manifest' name='cherokee'>
- <service name='network/http' type='service' version='1'>
-
-
- <!--
- Cherokee is an instance of the network/http service, it
- is not enabled by default.
- -->
- <instance name='cherokee' enabled='false'>
-
-
- <!--
- Cherokee dependencies
- -->
- <dependency name='loopback'
- grouping='require_all'
- restart_on='error'
- type='service'>
-
- <service_fmri value='svc:/network/loopback:default'/>
-
- </dependency>
-
- <dependency name='physical'
- grouping='optional_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/physical:default'/>
- </dependency>
-
-
- <!--
- start method
- -->
- <exec_method type='method'
- name='start'
- exec='/usr/sbin/cherokee -b'
- timeout_seconds='60'>
- <method_context>
- <method_credential user='root' group='root' />
- </method_context>
- </exec_method>
-
-
- <!--
- stop method
- -->
- <exec_method type='method'
- name='stop'
- exec='kill `cat /var/run/cherokee.pid`'
- timeout_seconds='60'>
- <method_context>
- <method_credential user='root' group='root' />
- </method_context>
- </exec_method>
-
-
- <!--
- resstart method
- -->
- <exec_method type='method'
- name='refresh'
- exec='kill -HUP `cat /var/run/cherokee.pid`'
- timeout_seconds='60'>
- <method_context>
- <method_credential user='root' group='root' />
- </method_context>
- </exec_method>
-
- <property_group name='startd' type='framework'>
- <propval name='duration' type='astring' value='contract'/>
- <propval name='ignore_error' type='astring' value='core,signal' />
- </property_group>
-
- </instance>
-
- <!--
- Describe the service
- -->
- <template>
- <common_name>
- <loctext xml:lang='C'>
- A flexible, very fast, lightweight Web server.
- </loctext>
- <loctext xml:lang='es'>
- Un servidor web, ligero, flexible y muy rapido.
- </loctext>
- </common_name>
- <documentation>
- <doc_link name='www.cherokee-project.com' uri='http://www.cherokee-project.com/doc' />
- </documentation>
- </template>
- </service>
-</service_bundle>
Added: cherokee/trunk/http-cherokee.xml.pre
===================================================================
--- cherokee/trunk/http-cherokee.xml.pre (rev 0)
+++ cherokee/trunk/http-cherokee.xml.pre 2009-07-05 08:11:47 UTC (rev 3424)
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+
+ Cherokee
+
+ Authors:
+ Rodrigo Fernandez-Vizarra <rodrigo.fernandez-vizarra[at]sun.com>
+
+ Copyright (C) 2006-2007 Alvaro Lopez Ortega
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of version 2 of the GNU General Public
+ License as published by the Free Software Foundation.
+
+ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA
+-->
+
+<service_bundle type='manifest' name='cherokee'>
+ <service name='network/http' type='service' version='1'>
+
+
+ <!--
+ Cherokee is an instance of the network/http service, it
+ is not enabled by default.
+ -->
+ <instance name='cherokee' enabled='false'>
+
+
+ <!--
+ Cherokee dependencies
+ -->
+ <dependency name='loopback'
+ grouping='require_all'
+ restart_on='error'
+ type='service'>
+
+ <service_fmri value='svc:/network/loopback:default'/>
+
+ </dependency>
+
+ <dependency name='physical'
+ grouping='optional_all'
+ restart_on='error'
+ type='service'>
+ <service_fmri value='svc:/network/physical:default'/>
+ </dependency>
+
+
+ <!--
+ start method
+ -->
+ <exec_method type='method'
+ name='start'
+ exec='%prefix%/sbin/cherokee -d'
+ timeout_seconds='60'>
+ <method_context>
+ <method_credential user='root' group='root' />
+ </method_context>
+ </exec_method>
+
+
+ <!--
+ stop method
+ -->
+ <exec_method type='method'
+ name='stop'
+ exec='kill `cat %localstatedir%/run/cherokee.pid`'
+ timeout_seconds='60'>
+ <method_context>
+ <method_credential user='root' group='root' />
+ </method_context>
+ </exec_method>
+
+
+ <!--
+ resstart method
+ -->
+ <exec_method type='method'
+ name='refresh'
+ exec='kill -HUP `cat %localstatedir%/run/cherokee.pid`'
+ timeout_seconds='60'>
+ <method_context>
+ <method_credential user='root' group='root' />
+ </method_context>
+ </exec_method>
+
+ <property_group name='startd' type='framework'>
+ <propval name='duration' type='astring' value='contract'/>
+ <propval name='ignore_error' type='astring' value='core,signal' />
+ </property_group>
+
+ </instance>
+
+ <!--
+ Describe the service
+ -->
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>
+ A flexible, very fast, lightweight Web server.
+ </loctext>
+ <loctext xml:lang='es'>
+ Un servidor web, ligero, flexible y muy rapido.
+ </loctext>
+ </common_name>
+ <documentation>
+ <doc_link name='www.cherokee-project.com' uri='http://www.cherokee-project.com/doc' />
+ </documentation>
+ </template>
+ </service>
+</service_bundle>
|
