fixup smf and pkg

package-manifest.toml

@@ -242,14 +242,26 @@ output.type = "zone"
 output.intermediate_only = true
 setup_hint = "Run `cargo xtask download clickhouse` to download the necessary binaries"
 
-[package.omicron-clickhouse-admin]
-service_name = "clickhouse-admin"
+[package.omicron-clickhouse-admin-keeper]
+service_name = "clickhouse-admin-keeper"
 only_for_targets.image = "standard"
 source.type = "local"
-source.rust.binary_names = ["clickhouse-admin"]
+source.rust.binary_names = ["clickhouse-admin-keeper"]
 source.rust.release = true
 source.paths = [
-  { from = "smf/clickhouse-admin", to = "/var/svc/manifest/site/clickhouse-admin" },
+  { from = "smf/clickhouse-admin-keeper", to = "/var/svc/manifest/site/clickhouse-admin-keeper" },
+]
+output.type = "zone"
+output.intermediate_only = true
+
+[package.omicron-clickhouse-admin-server]
+service_name = "clickhouse-admin-server"
+only_for_targets.image = "standard"
+source.type = "local"
+source.rust.binary_names = ["clickhouse-admin-server"]
+source.rust.release = true
+source.paths = [
+  { from = "smf/clickhouse-admin-server", to = "/var/svc/manifest/site/clickhouse-admin-server" },
 ]
 output.type = "zone"
 output.intermediate_only = true

smf/clickhouse-admin/manifest.xml → smf/clickhouse-admin-keeper/manifest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<service_bundle type='manifest' name='clickhouse-admin'>
+<service_bundle type='manifest' name='clickhouse-admin-keeper'>
 
-  <service name='oxide/clickhouse-admin' type='service' version='1'>
+  <service name='oxide/clickhouse-admin-keeper' type='service' version='1'>
   <create_default_instance enabled='true' />
 
   <dependency name='multi_user' grouping='require_all' restart_on='none'
@@ -17,7 +17,7 @@
   </dependency>
 
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent /opt/oxide/clickhouse-admin/bin/clickhouse-admin run -c /var/svc/manifest/site/clickhouse-admin/config.toml -a %{config/http_address} -l %{config/ch_address} -b %{config/ch_binary}  &amp;'
+    exec='ctrun -l child -o noorphan,regent /opt/oxide/clickhouse-admin-keeper/bin/clickhouse-admin-keeper run -c /var/svc/manifest/site/clickhouse-admin-keeper/config.toml -a %{config/http_address} -l %{config/ch_address} -b %{config/ch_binary}  &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
@@ -35,10 +35,10 @@
 
   <template>
     <common_name>
-      <loctext xml:lang='C'>Omicron ClickHouse Admin Server</loctext>
+      <loctext xml:lang='C'>Omicron ClickHouse Admin Keeper Server</loctext>
     </common_name>
     <description>
-      <loctext xml:lang='C'>Administering Oxide's Time-Series Database and Coordination Nodes</loctext>
+      <loctext xml:lang='C'>Administering Oxide's Time-Series Database Coordination Nodes</loctext>
     </description>
   </template>
 </service>

smf/clickhouse-admin-server/config.toml

@@ -0,0 +1,10 @@
+[dropshot]
+# 1 MiB; we don't expect any requests of more than nominal size.
+request_body_max_bytes = 1048576
+
+[log]
+# Show log messages of this level and more severe
+level = "info"
+mode = "file"
+path = "/dev/stdout"
+if_exists = "append"

smf/clickhouse-admin-server/manifest.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+
+<service_bundle type='manifest' name='clickhouse-admin-server'>
+
+  <service name='oxide/clickhouse-admin-server' type='service' version='1'>
+  <create_default_instance enabled='true' />
+
+  <dependency name='multi_user' grouping='require_all' restart_on='none'
+    type='service'>
+  <service_fmri value='svc:/milestone/multi-user:default' />
+  </dependency>
+
+  <dependency name='zone_network_setup' grouping='require_all' restart_on='none'
+    type='service'>
+  <service_fmri value='svc:/oxide/zone-network-setup:default' />
+  </dependency>
+
+  <exec_method type='method' name='start'
+    exec='ctrun -l child -o noorphan,regent /opt/oxide/clickhouse-admin-server/bin/clickhouse-admin-server run -c /var/svc/manifest/site/clickhouse-admin-server/config.toml -a %{config/http_address} -l %{config/ch_address} -b %{config/ch_binary}  &amp;'
+    timeout_seconds='0' />
+  <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
+
+  <property_group name='config' type='application'>
+    <propval name='http_address' type='astring' value='unknown' />
+    <propval name='ch_address' type='astring' value='unknown' />
+    <propval name='ch_binary' type='astring' value='unknown' />
+  </property_group>
+
+  <property_group name='startd' type='framework'>
+    <propval name='duration' type='astring' value='contract' />
+  </property_group>
+
+  <stability value='Unstable' />
+
+  <template>
+    <common_name>
+      <loctext xml:lang='C'>Omicron ClickHouse Admin Server for Replica Servers</loctext>
+    </common_name>
+    <description>
+      <loctext xml:lang='C'>Administering Oxide's Time-Series Database Data Nodes</loctext>
+    </description>
+  </template>
+</service>
+
+</service_bundle>