chg: bootstrap user needs to add domain before making himself admin (via sql)

afterwards the primary bootstrapper cannot add more domains to the org.

Change-Id: Ibb551d420f6648fbeaf550e46067f377871ae42d

diff --git a/bootstrap-user b/bootstrap-user
index da8c32720ecc13bba7afb86deb8f3739ef92f388..d1bbaa5e5968f1886b320c000944186003e71ede 100755 (executable)
--- a/bootstrap-user
+++ b/bootstrap-user
@@ -78,6 +78,7 @@ function register {
 }
 function check_error {
     cat > $folder/page_output
+    cat $folder/page_output >> $folder/log
     if grep -q "error-msgs" $folder/page_output; then
         cat $folder/page_output
         exit 1
@@ -148,14 +149,15 @@ if ! grep -q '^[0-9]\+$' <<< $mgmOid; then
 fi
 printf "Management Organisation id is \"%s\"\n" "$mgmOid"
 
+printf "adding org-domain for org %s: %s\n" "$mgmOid" "$hostname"
+csrf=$(mcurl orga/$mgmOid | csrf "head -n 4" "tail -n 1")
+domainName="$hostname"
+mcurl orga/$mgmOid -d "domain=$domainName&addDomain=action&csrf=$csrf" | check_error
+
 echo "using SQL to add self as orgadmin for organisation"
 sudo lxc-attach -n postgres-primary -- su -c "psql -d gigi" postgres <<EOF
 INSERT INTO org_admin("orgid", "memid", "creator", "master") VALUES('$mgmOid', (SELECT "id" FROM "users" WHERE "email"='$adminEmail'), (SELECT "id" FROM "users" WHERE "email"='$secondaryEmail'), 'y');
 EOF
-echo "adding org-domain"
-csrf=$(mcurl orga/$mgmOid | csrf "head -n 4" "tail -n 1")
-domainName="$hostname"
-mcurl orga/$mgmOid -d "domain=$domainName&addDomain=action&csrf=$csrf" | check_error
 
 csrf=$(mcurl account/details -v | csrf "tail -1")
 mcurl account/details -v -d "orgaForm=orga&org%3A$mgmOid&csrf=$csrf" | check_error