Merge pull request #1087 from ceefour/patch-without-site

fix(install): Obey --without-site

bench/playbooks/roles/bench/tasks/setup_erpnext.yml

@@ -13,16 +13,17 @@
   - name: Check whether the site already exists
     stat: path="{{ bench_path }}/sites/{{ site }}"
     register: site_folder
+    when: not without_site
 
   - name: Create a new site
     command: "bench new-site {{ site }} --admin-password '{{ admin_password }}' --mariadb-root-password '{{ mysql_root_password }}'"
     args:
       chdir: "{{ bench_path }}"
-    when: not site_folder.stat.exists
+    when: not without_site and not site_folder.stat.exists
 
   - name: Install ERPNext to default site
     command: "bench --site {{ site }} install-app erpnext"
     args:
       chdir: "{{ bench_path }}"
-    when: not without_erpnext
+    when: not without_site and not without_erpnext
 ...

install.py

@@ -327,8 +327,8 @@ def get_passwords(args):
 					mysql_root_password = ''
 					continue
 
-			# admin password
-			if not admin_password:
+			# admin password, only needed if we're also creating a site
+			if not admin_password and not args.without_site:
 				admin_password = getpass.unix_getpass(prompt='Please enter the default Administrator user password: ')
 				conf_admin_passswd = getpass.unix_getpass(prompt='Re-enter Administrator password: ')