Add setup step to the update part of the script.

2 files changed, 18 insertions, 0 deletions

diff --git a/INSTALL b/INSTALL
index eff25ab..7e51f51 100644
--- a/INSTALL
+++ b/INSTALL
@@ -412,6 +412,7 @@ from the rhodecode-config base directory:
 
     python scripts/rhodecode-setup --rhodecode-config config/production.ini \
     --rhodecode-usr $USR --rhodecode-branch $TAG \
+    --rhodecode-admin-email $EMAIL --rhodecode-admin-pwd $ADMIN_PWD \
     --rhodecode-checkout-dir $CO_DIR --dbname $DB_NAME \
     --assume-yes --update
 
diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index 2f6add8..7eca401 100755
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -207,6 +207,14 @@ def check_cli_args(args):
             print ("During update it is necessary to specify the RhodeCode"
                    "database name.")
             sys.exit(1)
+        if not args.rhodecode_admin_pwd:
+            print ("It is necessary to specify the administration "
+                   "password for RhodeCode")
+            sys.exit(1)
+        if not args.rhodecode_admin_email:
+            print ("It is necessary to specify the administration "
+                   "email for RhodeCode")
+            sys.exit(1)
 
     else:
         if not args.rhodecode_admin_pwd:
@@ -778,6 +786,15 @@ if __name__ == '__main__':
         update_rhodecode(args.rhodecode_branch, work_dir)
         reinstall_rhodecode(work_dir)
 
+        setup_rhodecode(work_dir,
+                        rhodecode_conf,
+                        args.repos_dir,
+                        args.rhodecode_admin_usr,
+                        args.rhodecode_admin_pwd,
+                        args.rhodecode_admin_email,
+                        user=args.rhodecode_usr,
+                        assume_yes=args.assume_yes)
+
         # Update database schema.
         update_database_schema(work_dir, rhodecode_conf, True)