diff options
| author | fhajny <fhajny@pkgsrc.org> | 2014-03-26 13:19:13 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2014-03-26 13:19:13 +0000 |
| commit | c9d6a884b4314f6834b8f7d329593b60780f1849 (patch) | |
| tree | e923b578d050f4bb55f02fe96d78d10bba8317a0 /databases | |
| parent | 448a46fbe94ea95f2ef8980b14e845449598950f (diff) | |
| download | pkgsrc-c9d6a884b4314f6834b8f7d329593b60780f1849.tar.gz | |
Fix SMF manifests that had stale placeholders.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql84-server/files/smf/manifest.xml | 18 | ||||
| -rw-r--r-- | databases/postgresql90-server/files/smf/manifest.xml | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/databases/postgresql84-server/files/smf/manifest.xml b/databases/postgresql84-server/files/smf/manifest.xml index 2e9972f4bd3..73ebcb6d4c6 100644 --- a/databases/postgresql84-server/files/smf/manifest.xml +++ b/databases/postgresql84-server/files/smf/manifest.xml @@ -2,6 +2,8 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <service_bundle type='manifest' name='@SMF_NAME@'> <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'> + <create_default_instance enabled='false' /> + <single_instance /> <dependency name='network' grouping='require_all' restart_on='none' type='service'> <service_fmri value='svc:/milestone/network:default' /> </dependency> @@ -14,15 +16,13 @@ <envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" /> </method_environment> </method_context> - <instance name='@SMF_INSTANCE@' enabled='false'> - <exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ start' timeout_seconds='300' /> - <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ stop' timeout_seconds='300' /> - <exec_method type='method' name='refresh' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ refresh' timeout_seconds='60' /> - <property_group name='config' type='application'> - <propval name='data' type='astring' value='@PGHOME@/data84' /> - <propval name='log' type='astring' value='@PGLOGFILE@' /> - </property_group> - </instance> + <exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ start' timeout_seconds='300' /> + <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ stop' timeout_seconds='300' /> + <exec_method type='method' name='refresh' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ refresh' timeout_seconds='60' /> + <property_group name='config' type='application'> + <propval name='data' type='astring' value='@PGHOME@/data' /> + <propval name='log' type='astring' value='@VARBASE@/log/postgresql.log' /> + </property_group> <stability value='Evolving' /> <template> <common_name> diff --git a/databases/postgresql90-server/files/smf/manifest.xml b/databases/postgresql90-server/files/smf/manifest.xml index 089639fb65e..73ebcb6d4c6 100644 --- a/databases/postgresql90-server/files/smf/manifest.xml +++ b/databases/postgresql90-server/files/smf/manifest.xml @@ -20,8 +20,8 @@ <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ stop' timeout_seconds='300' /> <exec_method type='method' name='refresh' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ refresh' timeout_seconds='60' /> <property_group name='config' type='application'> - <propval name='data' type='astring' value='@PGDATA@' /> - <propval name='log' type='astring' value='@PGLOGFILE@' /> + <propval name='data' type='astring' value='@PGHOME@/data' /> + <propval name='log' type='astring' value='@VARBASE@/log/postgresql.log' /> </property_group> <stability value='Evolving' /> <template> |