[system] use SMF for composer

opsmezzo · Nov 6, 2013 · a816772 · mmalecki · Nov 6, 2013 · jcrugzz
1 parent 0fe113e
commit a816772
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/opsmezzo/composer/files/composer.xml b/opsmezzo/composer/files/composer.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='composer'>
+  <service name='application/composer' type='service' version='0'>
+    <create_default_instance enabled='true'/>
+    <single_instance/>
+    <dependency name='multiuser' grouping='require_all' restart_on='error' type='service'>
+      <service_fmri value='svc:/milestone/multi-user:default'/>
+    </dependency>
+    <exec_method name='start' type='method' exec='forever start $HOME/conservatory/bin/composer --config $HOME/config/composer.json' timeout_seconds='60'>
+      <method_context>
+        <method_credential user='root' group='root'/>
+        <method_environment>
+          <envvar name='PATH' value='/opt/local/bin:/usr/bin:/bin'/>
+          <envvar name='HOME' value='/root'/>
+        </method_environment>
+      </method_context>
+    </exec_method>
+    <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'>
+      <method_context />
+    </exec_method>
+  </service>
+</service_bundle>
diff --git a/opsmezzo/composer/scripts/configure.sh b/opsmezzo/composer/scripts/configure.sh
@@ -3,4 +3,6 @@
 #
 # Configure quill-composer
 #
-npm-configure quill-composer
+npm-configure quill-composer
+
+svccfg import ../files/composer.xml
diff --git a/opsmezzo/composer/scripts/start.sh b/opsmezzo/composer/scripts/start.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
 #
-# Start bin/composer with forever
+# Start bin/composer with SMF
 #
-forever start $HOME/quill-composer/bin/composer -e $q_env --config $HOME/config/composer.json -p $q_composer_port
+svcadm enable composer
diff --git a/opsmezzo/composer/system.json b/opsmezzo/composer/system.json
@@ -1,6 +1,6 @@
 {
   "name": "composer",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Configuration management, and SSH key management sauteed in awesomesauce",
   "keywords": ["configuration management", "devops"],
   "author": "Nodejitsu Inc <info@nodejitsu.com>",

diff --git a/opsmezzo/composer/templates/composer.json b/opsmezzo/composer/templates/composer.json
@@ -1,9 +1,11 @@
 {
   "log": {{ composer.log }}
+  , "env": "{{ env }}"
+  , "port": {{ composer.port }}
   {{#exceptions}}
   , "exceptions": {{.}}
   {{/exceptions}}
-  {{#loggly}}  
+  {{#loggly}}
   , "loggly": {{.}}
   {{/loggly}}
   , "database": {{ composer.database }}