#90: SMF should use contract

Author: nshalman

.github/workflows/nshalman-sunos-releases.yml

@@ -33,7 +33,9 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
           files: |
-            cmd/tailscaled/tailscale.xml
+            cmd/tailscaled/smf/install
+            cmd/tailscaled/smf/tailscale.xml
+            cmd/tailscaled/smf/vpn-tailscale
             sha256sums
             tailscale-illumos
             tailscale-solaris

build.sh

@@ -40,6 +40,8 @@ for GOOS in illumos solaris; do
 	mv tailscale{,-${GOOS}}
 done
 
-ln cmd/tailscaled/tailscale.xml .
-shasum -a 256 tailscaled-* tailscale-* tailscale.xml >sha256sums
-rm ./tailscale.xml
+ln cmd/tailscaled/smf/tailscale.xml .
+ln cmd/tailscaled/smf/vpn-tailscale .
+ln cmd/tailscaled/smf/install .
+shasum -a 256 install tailscaled-* tailscale-* tailscale.xml vpn-tailscale>sha256sums
+rm ./tailscale.xml ./vpn-tailscale ./install

cmd/tailscaled/smf/install

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -o xtrace
+set -o errexit
+
+fail () {
+	echo "$@"
+	exit 1
+}
+
+PREFIX=/usr
+
+# On a SmartOS GZ, use /opt
+if [[ $(zonename) == "global" ]] && uname -v | grep -q joyent
+then
+	PREFIX=/opt
+fi
+
+svcadm disable -t vpn/tailscale || true
+
+# See https://github.com/nshalman/tailscale/issues/90
+# On hosts currently running taildrive
+# disable is kind of broken
+# clean up manually
+svccfg -s tailscale listprop startd/duration | grep -q contract || \
+	echo "Cleaning up after broken SMF manifest"
+sleep 1
+pkill tailscaled || true
+svcadm disable -st vpn/tailscale || true
+svccfg delete vpn/tailscale
+
+TMPDIR="$(mktemp -d)"
+pushd "${TMPDIR?}"
+
+DOWNLOAD=https://github.com/nshalman/tailscale/releases/latest/download
+# TODO: Would this work for Solaris?? what is Solaris "uname -o"?
+OS="$(uname -o)"
+
+curl -fLO "${DOWNLOAD}/sha256sums"
+curl -fLO "${DOWNLOAD}/tailscaled-${OS?}"
+curl -fLO "${DOWNLOAD}/tailscale.xml"
+curl -fLO "${DOWNLOAD}/vpn-tailscale"
+
+sha256sum --ignore-missing -c sha256sums
+rm sha256sums
+
+chmod +x "tailscaled-${OS?}"
+chmod +x "vpn-tailscale"
+mv "tailscaled-${OS?}" "/${PREFIX?}/local/sbin/tailscaled"
+rm -f "/${PREFIX?}/local/sbin/tailscale"
+ln -s tailscaled "/${PREFIX?}/local/sbin/tailscale"
+<tailscale.xml | sed "s/@@PREFIX@@/${PREFIX?}/" > import.xml
+svccfg import import.xml
+svccfg setprop vpn/tailscale application/binary="/${PREFIX?}/local/sbin/tailscaled"
+svcadm enable -st vpn/tailscale
+rm tailscale.xml import.xml
+
+popd
+rm -rf "${TMPDIR}"
+
+sleep 2
+tailscale status

cmd/tailscaled/tailscale.xml renamed to cmd/tailscaled/smf/tailscale.xml

@@ -13,12 +13,10 @@
     <method_context>
       <method_credential group='root' user='root'/>
     </method_context>
-    <exec_method name='start' type='method' exec='/usr/local/sbin/tailscaled' timeout_seconds='60'/>
-    <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
-    <property_group name='application' type='application'/>
-    <property_group name='startd' type='framework'>
-      <propval name='duration' type='astring' value='child'/>
-      <propval name='ignore_error' type='astring' value='core,signal'/>
+    <exec_method name='start' type='method' exec='/@@PREFIX@@/local/lib/svc/method/vpn-tailscale %m' timeout_seconds='5'/>
+    <exec_method name='stop' type='method' exec='/@@PREFIX@@/local/lib/svc/method/vpn-tailscale %m %{restarter/contract}' timeout_seconds='5'/>
+    <property_group name='application' type='application'>
+      <propval name='binary' type='astring' value='/@@PREFIX@@/local/sbin/tailscaled'/>
     </property_group>
     <stability value='Evolving'/>
     <template>

cmd/tailscaled/smf/vpn-tailscale

@@ -0,0 +1,22 @@
+#!/sbin/sh
+# Init script for tailscaled.
+
+. /lib/svc/share/smf_include.sh
+
+TAILSCALED=$(svcprop -p application/binary $SMF_FMRI)
+case "$1" in
+start)
+	smf_clear_env
+	"${TAILSCALED?}" &
+	;;
+stop)
+	smf_kill_contract $2 TERM 60
+	"${TAILSCALED?}" --cleanup
+	;;
+*)
+	echo "Usage: $0 {start|stop}" >&2
+	exit 1
+	;;
+esac
+
+exit $SMF_EXIT_OK