Move gogs admin user creation into its own errand

README.md

@@ -27,4 +27,12 @@ bosh -d gogs deploy gogs-boshrelease/manifests/gogs.yml \
 open https://gogs.v3.pcfdev.io/user/sign_up
 ```
 
-Note: `--vars-store creds.yml` is not required if your BOSH environment is configured with Credhub.
+Note: `--vars-store creds.yml` is not required if your BOSH environment is configured with Credhub.
+
+## Post Deploy Errand
+To create an admin user after deploying GOGS, run the following errand.
+
+This was moved from the `gogs_ctl` script to this errand as it was never executed previously
+```
+bosh -d gogs run-errand gogs-admin
+```

jobs/gogs-admin/spec

@@ -0,0 +1,17 @@
+---
+name: gogs-admin
+
+templates:
+  run.sh.erb: bin/run
+
+packages: []
+
+properties:
+  gogs.admin:
+    description: "Admin user for gogs"
+    default: 'gogs'
+  gogs.password:
+    description: "Password for admin user"
+  gogs.email:
+    description: "Email for admin account"
+    default: 'admin@example.com'

jobs/gogs-admin/templates/run.sh.erb

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+export PACKAGE_DIR=/var/vcap/packages/gogs
+export STORE_DIR=/var/vcap/store/gogs
+
+# Create admin user for the initial
+su - git -c "${PACKAGE_DIR}/gogs admin create-user \
+  --name <%= p('gogs.admin') %> \
+  --password <%= p('gogs.password') %> \
+  --email <%= p('gogs.email') %> \
+  --admin \
+  --config ${STORE_DIR}/config/app.ini"

jobs/gogs/spec

@@ -33,14 +33,6 @@ properties:
   gogs.start_ssh_server:
     description: "Start SSH Server"
     default: "true"
-  gogs.admin:
-    description: "Admin user for gogs"
-    default: 'gogs'
-  gogs.password:
-    description: "Password for admin user"
-  gogs.email:
-    description: "Email for admin account"
-    default: 'admin@example.com'
   gogs.secret_key:
     description: "Global secret key for your server security"
   gogs.tls_cert:

jobs/gogs/templates/bin/gogs_ctl

@@ -56,14 +56,6 @@ case $1 in
          >>$LOG_DIR/$JOB_NAME.stdout.log \
          2>>$LOG_DIR/$JOB_NAME.stderr.log
 
-    # Create admin user for the initial
-    su git -c "${PACKAGE_DIR}/gogs admin create-user \
-		      --name <%= p('gogs.admin') %> \
-		      --password <%= p('gogs.password') %> \
-		      --email <%= p('gogs.email') %> \
-                      --admin \
-		      --config ${STORE_DIR}/config/app.ini"
-
     ;;
 
   stop)

manifests/gogs.yml

@@ -14,6 +14,8 @@ instance_groups:
     release: gogs
   - name: gogs
     release: gogs
+  - name: gogs-admin
+    release: gogs
 - name: sanity-test
   azs: [z1]
   instances: 1