From 6b3ef05d97bc1b0921f2cfd75c8f22712aaf0e19 Mon Sep 17 00:00:00 2001
From: shreyas <shreyas@erpnext.com>
Date: Wed, 4 May 2016 13:23:33 +0530
Subject: [PATCH 1/6] [Major] Migrating setup_frappe script from bash to
 ansible

---
 playbooks/develop/centos.yml                  |  14 +--
 playbooks/develop/includes/mariadb_centos.yml |   1 +
 playbooks/develop/includes/mariadb_ubuntu.yml |  12 +-
 playbooks/develop/includes/setup_bench.yml    |   8 +-
 .../includes/setup_bench_production.yml       |  60 ++++++++++
 playbooks/develop/includes/setup_mariadb.yml  |  29 +++--
 playbooks/develop/includes/setup_prod_env.yml | 105 +++++++++++++++++
 .../develop/includes/setup_selinux_policy.yml |  38 ++++++
 playbooks/develop/install.yml                 |   4 -
 playbooks/develop/setup_production.yml        |  14 +++
 playbooks/develop/templates/default_nginx.j2  |  42 +++++++
 playbooks/develop/templates/frappe_selinux.te |  32 ++++++
 playbooks/develop/ubuntu.yml                  |   6 +-
 playbooks/install.py                          | 108 ++++++++++++++++--
 14 files changed, 434 insertions(+), 39 deletions(-)
 create mode 100644 playbooks/develop/includes/setup_bench_production.yml
 create mode 100644 playbooks/develop/includes/setup_prod_env.yml
 create mode 100644 playbooks/develop/includes/setup_selinux_policy.yml
 create mode 100644 playbooks/develop/setup_production.yml
 create mode 100644 playbooks/develop/templates/default_nginx.j2
 create mode 100644 playbooks/develop/templates/frappe_selinux.te

diff --git a/playbooks/develop/centos.yml b/playbooks/develop/centos.yml
index 5fc52f19..44e12e98 100644
--- a/playbooks/develop/centos.yml
+++ b/playbooks/develop/centos.yml
@@ -9,12 +9,6 @@
 
   tasks:
 
-  # install pre-requisites
-  - name: add epel repo
-    yum: name="https://dl.fedoraproject.org/pub/epel/{{ ansible_lsb.major_release }}/x86_64/e/epel-release-*.rpm" state=present
-    become: yes
-    become_user: root
-
   - name: development tools package
     yum: name="@Development tools" state=present
     become: yes
@@ -23,13 +17,17 @@
   - name: install prequisites
     yum: pkg={{ item }} state=present
     with_items:
+      # Install epel-release
+      - epel-release
+
       # basic installs
       - redis
       - nodejs
       - npm
 
       # for mariadb
-      - software-properties-common
+      - mysql-devel
+      - mysql-libs
 
       # for wkhtmltopdf
       - libXrender
@@ -48,6 +46,8 @@
       - tcl-devel
       - tk-devel
 
+    #   To ensure that ansible_lsb is set
+      - redhat-lsb-core  
     become: yes
     become_user: root
 
diff --git a/playbooks/develop/includes/mariadb_centos.yml b/playbooks/develop/includes/mariadb_centos.yml
index 766fd276..37454f1f 100644
--- a/playbooks/develop/includes/mariadb_centos.yml
+++ b/playbooks/develop/includes/mariadb_centos.yml
@@ -6,6 +6,7 @@
 
   - name: Install MariaDB
     yum: pkg={{ item }} state=present
+    with_items:
       - MariaDB-server
       - MariaDB-client
     become: yes
diff --git a/playbooks/develop/includes/mariadb_ubuntu.yml b/playbooks/develop/includes/mariadb_ubuntu.yml
index 735df132..a33186e7 100644
--- a/playbooks/develop/includes/mariadb_ubuntu.yml
+++ b/playbooks/develop/includes/mariadb_ubuntu.yml
@@ -1,10 +1,17 @@
 ---
-  - name: Add apt key
+  - name: Add apt key for mariadb for Ubuntu < 16.04
     apt_key: keyserver=hkp://keyserver.ubuntu.com:80 id=0xcbcb082a1bb943db state=present
     become: yes
     become_user: root
+    when: ansible_distribution_version | version_compare('16.04', 'lt')
 
-  - name: Add apt repositry
+  - name: Add apt key for mariadb for Ubuntu >= 16.04
+    apt_key: keyserver=hkp://keyserver.ubuntu.com:80 id=0xF1656F24C74CD1D8 state=present
+    become: yes
+    become_user: root
+    when: ansible_distribution_version | version_compare('16.04', 'ge')
+
+  - name: Add apt repository
     apt_repository: repo='deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu {{ ansible_distribution_release }} main' state=present
     become: yes
     become_user: root
@@ -18,4 +25,3 @@
       - libmariadbclient-dev
     become: yes
     become_user: root
-
diff --git a/playbooks/develop/includes/setup_bench.yml b/playbooks/develop/includes/setup_bench.yml
index 5cc0a4f8..71961081 100644
--- a/playbooks/develop/includes/setup_bench.yml
+++ b/playbooks/develop/includes/setup_bench.yml
@@ -4,10 +4,15 @@
     become: yes
     become_user: root
 
+  - name: Check whether bench exists
+    stat: path="{{ bench_path }}"
+    register: bench_stat
+
   - name: init bench
-    command: bench init {{ bench_path }}
+    command: bench init {{ bench_path }} --frappe-branch {{ branch }}
     args:
       creates: "{{ bench_path }}"
+    when: not bench_stat.stat.exists
 
   # setup common_site_config
   - name: setup config
@@ -43,4 +48,3 @@
     args:
       creates: "{{ bench_path }}/config/redis_socketio.conf"
       chdir: "{{ bench_path }}"
-
diff --git a/playbooks/develop/includes/setup_bench_production.yml b/playbooks/develop/includes/setup_bench_production.yml
new file mode 100644
index 00000000..bf181b01
--- /dev/null
+++ b/playbooks/develop/includes/setup_bench_production.yml
@@ -0,0 +1,60 @@
+---
+  - hosts: localhost
+    vars:
+      bench_path: "/home/{{ ansible_user_id }}/benches/frappe-bench"
+
+    tasks:
+
+    # In case we are re-running the script, we would like to skip the site creation
+    - name: Check whether a site exists
+      stat: path="{{ bench_path }}/sites/{{ site }}"
+      register: site_folder
+
+    - name: Create 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
+
+    - name: Check ERPNext App exists
+      stat: path="{{ bench_path }}/apps/erpnext"
+      register: app
+
+    # In case we are re-running the script, we would like to skip getting ERPNext App
+    - name: Get-app erpnext app
+      command: bench get-app erpnext https://github.com/frappe/erpnext.git --branch {{ branch }}
+      args:
+        chdir: '{{ bench_path }}'
+      when: not app.stat.exists
+
+    - name: Install erpnext app
+      command: bench --site {{ site }} install-app erpnext
+      args:
+        chdir: '{{ bench_path }}'
+
+    - name: Change permissions for frappe home folder
+      file:
+        dest: /home/{{ ansible_user_id }}
+        owner: '{{ ansible_user_id }}'
+        group: '{{ ansible_user_id }}'
+        mode: 0755
+        recurse: yes
+
+    - name: Setup production
+      become: yes
+      become_user: root
+      command: bench setup production {{ ansible_user_id }}
+      args:
+        chdir: '{{ bench_path }}'
+
+    - name: Setup Sudoers
+      become: yes
+      become_user: root
+      command: bench setup sudoers {{ ansible_user_id }}
+      args:
+        chdir: '{{ bench_path }}'
+
+    - name: Restart the bench
+      command: bench restart
+      args:
+        chdir: '{{ bench_path }}'
diff --git a/playbooks/develop/includes/setup_mariadb.yml b/playbooks/develop/includes/setup_mariadb.yml
index 209dbc4e..a6717f5e 100644
--- a/playbooks/develop/includes/setup_mariadb.yml
+++ b/playbooks/develop/includes/setup_mariadb.yml
@@ -2,35 +2,40 @@
   - name: Install MySQLdb in global env
     pip: name=mysql-python version=1.2.5
     become: yes
-    become_method: sudo
+    become_user: root
 
-  - name: Set root Password
+  - name: Set root Password for Ubuntu
     mysql_user:
-      name=root
-      host={{ item }}
-      password={{ mysql_root_password }}
-      state=present
-      login_user=root
+      name: root
+      host: '{{ item }}'
+      password: '{{ mysql_root_password }}'
+      state: present
+      login_user: root
     with_items:
       - localhost
-    when: mysql_root_password is defined
     become: yes
-    become_method: sudo
-
+    become_user: root
     # when you have already defined mysql root password
     ignore_errors: yes
+    when: mysql_root_password is defined and ansible_distribution == 'Ubuntu'
 
   - name: Add configuration
     template: src={{ mysql_config_template }} dest={{ mysql_conf_dir }}/frappe.cnf owner=root mode=0644
     become: yes
-    become_method: sudo
+    become_user: root
 
   - name: restart mysql linux
     service: name=mysql state=restarted
     become: yes
-    become_method: sudo
+    become_user: root
     when: ansible_os_family == 'RedHat' or ansible_os_family == 'Debian'
 
+  - name: Set root password on CentOS
+    command: mysqladmin -u root password '{{ mysql_root_password }}'
+    become: yes
+    become_user: root
+    when: mysql_root_password is defined and ansible_distribution == 'CentOS'
+
   - name: add launchagents folder mac
     file: path=~/Library/LaunchAgents state=directory
     when: ansible_distribution == 'MacOSX'
diff --git a/playbooks/develop/includes/setup_prod_env.yml b/playbooks/develop/includes/setup_prod_env.yml
new file mode 100644
index 00000000..bbe9da21
--- /dev/null
+++ b/playbooks/develop/includes/setup_prod_env.yml
@@ -0,0 +1,105 @@
+---
+- hosts: localhost
+
+  tasks:
+
+  #####################################
+  # Ubuntu Production Environment Setup
+  - name: Install production pre-requisites
+    become: yes
+    become_user: root
+    apt: pkg={{ item }} state=present
+    with_items:
+      - nginx
+      - screen
+      - vim
+      - htop
+      - git
+      - postfix
+      - supervisor
+    when: ansible_distribution == 'Ubuntu'
+
+  #####################################
+  # CentOS Production Environment Setup
+  - name: Install production pre-requisites
+    become: yes
+    become_user: root
+    yum: pkg={{ item }} state=present
+    with_items:
+      - nginx
+      - screen
+      - vim
+      - htop
+      - git
+      - postfix
+      - MySQL-python
+    when: ansible_distribution == 'CentOS'
+
+  - name: Install supervisor using yum for Centos 7
+    yum: pkg=supervisor state=present
+    become: yes
+    become_user: root
+    when: ansible_distribution == 'CentOS' and ansible_lsb.major_release == '7'
+
+  ####################################################
+  # Replace default nginx config with nginx template
+  - name: Rename default nginx.conf to nginx.conf.old
+    command: mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old
+    become: yes
+    become_user: root
+
+  - name: Copy the nginx_config template
+    template:
+      src: ../templates/default_nginx.j2
+      dest: /etc/nginx/nginx.conf
+    become: yes
+    become_user: root
+
+  - name: Reload the nginx service
+    service:
+      name: nginx
+      state: reloaded
+    become: yes
+    become_user: root
+
+  ####################################################
+  # Enable nginx, mysql, redis and supevisord services
+  - name: Enable nginx, mysql, and redis
+    service:
+      name: '{{ item }}'
+      enabled: yes
+    with_items:
+      - nginx
+      - mysql
+    become: yes
+    become_user: root
+
+  - name: Enable redis.service on centos
+    service:
+      name: redis
+      enabled: yes
+    become: yes
+    become_user: root
+    when: ansible_distribution == 'CentOS'
+
+  - name: Enable redis-server.service on ubuntu
+    service:
+      name: redis-server
+      enabled: yes
+    become: yes
+    become_user: root
+    when: ansible_distribution == 'Ubuntu'
+
+  - name: Stat supervisor.conf
+    stat:
+      path: /etc/supervisord.conf
+    register: supervisor_conf
+
+  - name: Check whether default supervisor.conf exists
+    service:
+      name: supervisord
+      state: started
+      enabled: yes
+    become: yes
+    become_user: root
+    when: supervisor_conf.stat.exists
diff --git a/playbooks/develop/includes/setup_selinux_policy.yml b/playbooks/develop/includes/setup_selinux_policy.yml
new file mode 100644
index 00000000..98904e53
--- /dev/null
+++ b/playbooks/develop/includes/setup_selinux_policy.yml
@@ -0,0 +1,38 @@
+---
+- hosts: localhost
+  tasks:
+    - name: Install SELinux for CentOS
+      yum: name="{{item}}" state=present
+      with_items:
+        - policycoreutils-python
+        - selinux-policy-devel
+      become: yes
+      become_user: root
+      when: ansible_distribution == 'CentOS'
+
+    - name: Install SELinux for Ubuntu
+      apt: name={{ item }} state=present
+      with_items:
+       - selinux
+       - selinux-policy-dev
+      become: yes
+      become_user: root
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Check enabled SELinux modules
+     shell: semanage module -l
+     register: enabled_modules
+
+    - name: Copy frappe_selinux policy
+      copy: src=templates/frappe_selinux.te dest=/root/frappe_selinux.te
+      register: dest_frappe_selinux_te
+      become: yes
+      become_user: root
+
+    - name: Compile frappe_selinux policy
+      shell: "make -f /usr/share/selinux/devel/Makefile frappe_selinux.pp && semodule -i frappe_selinux.pp"
+      args:
+      chdir: /root/
+      become: yes
+      become_user: root
+      when: "enabled_modules.stdout.find('frappe_selinux') == -1 or dest_frappe_selinux_te.changed"
diff --git a/playbooks/develop/install.yml b/playbooks/develop/install.yml
index dfec2ceb..ed7898f4 100644
--- a/playbooks/develop/install.yml
+++ b/playbooks/develop/install.yml
@@ -1,9 +1,5 @@
 ---
 - hosts: localhost
-  vars_prompt:
-    - name: mysql_root_password
-      prompt: "MySQL Root Password"
-      when: ansible_distribution == 'Ubuntu'
 
 - include: macosx.yml
   when: ansible_distribution == 'MacOSX'
diff --git a/playbooks/develop/setup_production.yml b/playbooks/develop/setup_production.yml
new file mode 100644
index 00000000..52448e70
--- /dev/null
+++ b/playbooks/develop/setup_production.yml
@@ -0,0 +1,14 @@
+---
+  - hosts: localhost
+
+  # Install the common pre-requisites for the setting up bench
+  - include: install.yml
+
+  # Install the production environment
+  - include: includes/setup_prod_env.yml
+
+  # Setup Bench for production environment
+  - include: includes/setup_bench_production.yml
+
+  # Setup SELinux Policy, Optional can be done later
+  # - include: includes/setup_selinux_policy.yml
diff --git a/playbooks/develop/templates/default_nginx.j2 b/playbooks/develop/templates/default_nginx.j2
new file mode 100644
index 00000000..f3cf614d
--- /dev/null
+++ b/playbooks/develop/templates/default_nginx.j2
@@ -0,0 +1,42 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+{% if ansible_distribution == 'Ubuntu' %}
+	{% set nginx_user = 'www-data'%}
+{% elif ansible_distribution == 'CentOS' %}
+	{% set nginx_user = 'nginx '%}
+{% else %}
+	{% set nginx_user = 'nobody' %}
+{% endif %}
+
+user {{ nginx_user }};
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+events {
+    worker_connections {{ max_worker_connections }};
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+}
diff --git a/playbooks/develop/templates/frappe_selinux.te b/playbooks/develop/templates/frappe_selinux.te
new file mode 100644
index 00000000..0551ebad
--- /dev/null
+++ b/playbooks/develop/templates/frappe_selinux.te
@@ -0,0 +1,32 @@
+module frappe_selinux 1.0;
+
+require {
+	type user_home_dir_t;
+	type httpd_t;
+	type user_home_t;
+	type soundd_port_t;
+	class tcp_socket name_connect;
+	class lnk_file read;
+	class dir { getattr search };
+	class file { read open };
+}
+
+#============= httpd_t ==============
+
+#!!!! This avc is allowed in the current policy
+allow httpd_t soundd_port_t:tcp_socket name_connect;
+
+#!!!! This avc is allowed in the current policy
+allow httpd_t user_home_dir_t:dir search;
+
+#!!!! This avc is allowed in the current policy
+allow httpd_t user_home_t:dir { getattr search };
+
+#!!!! This avc can be allowed using the boolean 'httpd_read_user_content'
+allow httpd_t user_home_t:file open;
+
+#!!!! This avc is allowed in the current policy
+allow httpd_t user_home_t:file read;
+
+#!!!! This avc is allowed in the current policy
+allow httpd_t user_home_t:lnk_file read;
diff --git a/playbooks/develop/ubuntu.yml b/playbooks/develop/ubuntu.yml
index 6896bbcf..028b5a47 100644
--- a/playbooks/develop/ubuntu.yml
+++ b/playbooks/develop/ubuntu.yml
@@ -2,7 +2,7 @@
 - hosts: localhost
   vars:
     bench_repo_path: "/usr/local/frappe/bench-repo"
-    bench_path: "/home/{{ ansible_user_id }}/frappe/frappe-bench"
+    bench_path: "/home/{{ ansible_user_id }}/benches/frappe-bench"
     mysql_config_template: "templates/simple_mariadb_config.cnf"
     mysql_conf_dir: /etc/mysql/conf.d/
     wkhtmltopdf_version: 0.12.2.1
@@ -45,11 +45,11 @@
       - libtiff4-dev
       - tcl8.5-dev
       - tk8.5-dev
-    when: ansible_distribution_version < 14.04
+    when: ansible_distribution_version | version_compare('14.04', 'lt')
     become: yes
     become_user: root
 
-  - name: install pillow prerequisites for Ubuntu > 14.04
+  - name: install pillow prerequisites for Ubuntu >= 14.04
     apt: pkg={{ item }} state=present
     with_items:
       - libtiff5-dev
diff --git a/playbooks/install.py b/playbooks/install.py
index 0611fc54..74b5aa53 100644
--- a/playbooks/install.py
+++ b/playbooks/install.py
@@ -3,6 +3,7 @@ import os
 import sys
 import subprocess
 import getpass
+import json, multiprocessing
 from distutils.spawn import find_executable
 
 bench_repo = '/usr/local/frappe/bench-repo'
@@ -12,12 +13,14 @@ def install_bench(args):
 	success = run_os_command({
 		'apt-get': [
 			'sudo apt-get update',
-			'sudo apt-get install -y git build-essential python-setuptools python-dev'
+			'sudo apt-get install -y git build-essential python-setuptools python-dev libffi-dev libssl-dev'
 		],
 		'yum': [
 			'sudo yum groupinstall -y "Development tools"',
-			'sudo yum install -y git python-setuptools python-devel'
+			'sudo yum install -y git python-setuptools python-devel openssl-devel libffi-devel'
 		],
+		# epel-release is required to install redis, so installing it before the playbook-run.
+		# redhat-lsb-core is required, so that ansible can set ansible_lsb variable
 	})
 
 	if not find_executable("git"):
@@ -41,6 +44,11 @@ def install_bench(args):
 		'yum': 'sudo python get-pip.py',
 	})
 
+	# In some cases setup_tools are not updated, We will force update it.
+	run_os_command({
+		'pip': 'sudo pip install --upgrade setuptools'
+	})
+
 	success = run_os_command({
 		'pip': 'sudo pip install ansible'
 	})
@@ -54,8 +62,11 @@ def install_bench(args):
 	# clone bench repo
 	clone_bench_repo()
 
+	# args is namespace, but we would like to use it as dict in calling function, so use vars()
 	if args.develop:
-		run_playbook('develop/install.yml', sudo=True)
+		run_playbook('develop/install.yml', sudo=True, extra_args=vars(args))
+	elif args.setup_production:
+		run_playbook('develop/setup_production.yml', sudo=True, extra_args=vars(args))
 
 def install_python27():
 	version = (sys.version_info[0], sys.version_info[1])
@@ -123,10 +134,71 @@ def could_not_install(package):
 def is_sudo_user():
 	return os.geteuid() == 0
 
-def run_playbook(playbook_name, sudo=False):
-	args = ['ansible-playbook', '-c', 'local',  playbook_name]
+def get_passwords(run_travis=False):
+	if not run_travis:
+		mysql_root_password, admin_password = '', ''
+		pass_set = True
+		while pass_set:
+			# mysql root password
+			if not mysql_root_password:
+				mysql_root_password = getpass.unix_getpass(prompt='Please enter mysql root password: ')
+				conf_mysql_passwd = getpass.unix_getpass(prompt='Re-enter mysql root password: ')
+
+				if mysql_root_password != conf_mysql_passwd:
+					mysql_root_password = ''
+					continue
+
+			# admin password
+			if not admin_password:
+				admin_password = getpass.unix_getpass(prompt='Please enter Administrator password: ')
+				conf_admin_passswd = getpass.unix_getpass(prompt='Re-enter Administrator password: ')
+
+				if admin_password != conf_admin_passswd:
+					admin_password = ''
+					continue
+
+			pass_set = False
+	else:
+		mysql_root_password = admin_password = 'travis'
+
+	return {
+		'mysql_root_password': mysql_root_password,
+		'admin_password': admin_password
+	}
+
+def get_extra_vars_json(extra_args, run_travis=False):
+	# We need to pass setup_production as extra_vars to the playbook to execute conditionals in the
+	# playbook. Extra variables can passed as json or key=value pair. Here, we will use JSON.
+	json_path = os.path.join(os.path.abspath(os.path.expanduser('~')), 'extra_vars.json')
+	extra_vars = dict(extra_args.items())
+
+	# Get mysql root password and admin password
+	run_travis = extra_args.get('run_travis')
+	extra_vars.update(get_passwords(run_travis))
+
+	# Decide for branch to be cloned depending upon whether we setting up production
+	branch = 'master' if extra_args.get('setup_production') else 'develop'
+	extra_vars.update(branch=branch)
+
+	# Get max worker_connections in nginx.
+	# https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
+	# The amount of clients that can be served can be multiplied by the amount of cores.
+ 	extra_vars.update(max_worker_connections=multiprocessing.cpu_count() * 1024)
+
+	with open(json_path, mode='w') as j:
+		json.dump(extra_vars, j, indent=1, sort_keys=True)
+
+	return ('@' + json_path)
+
+def run_playbook(playbook_name, sudo=False, extra_args=None):
+	extra_vars = get_extra_vars_json(extra_args)
+	args = ['ansible-playbook', '-c', 'local',  playbook_name, '-e', extra_vars]
+
 	if sudo:
-		args.append('-K')
+		args.extend(['--become', '--become-user=frappe'])
+
+	if extra_args.get('run_verbose'):
+		args.append('-vvvv')
 
 	success = subprocess.check_call(args, cwd=os.path.join(bench_repo, 'playbooks'))
 	return success
@@ -135,8 +207,28 @@ def parse_commandline_args():
 	import argparse
 
 	parser = argparse.ArgumentParser(description='Frappe Installer')
-	parser.add_argument('--develop', dest='develop', action='store_true', default=False,
-						help='Install developer setup')
+
+	# Arguments develop and setup-production are mutually exclusive both can't be specified together.
+	# Hence, we need to create a group for discouraging use of both options at the same time.
+	args_group = parser.add_mutually_exclusive_group()
+
+	args_group.add_argument('--develop', dest='develop', action='store_true', default=False,
+		help='Install developer setup')
+
+	args_group.add_argument('--setup-production', dest='setup_production', action='store_true',
+		default=False, help='Setup Production environment for bench')
+
+	parser.add_argument('--site', dest='site', action='store', default='site1.local',
+		help='Specifiy name for your first ERPNext site')
+
+	# Hidden arguments to the argsparse
+	parser.add_argument('--run-verbose', dest='run_verbose', action='store_true', default=False,
+		help=argparse.SUPPRESS)
+
+	# To enable testing of script using Travis, this should skip the prompt
+	parser.add_argument('--run-travis', dest='run_travis', action='store_true', default=False,
+		help=argparse.SUPPRESS)
+
 	args = parser.parse_args()
 
 	return args

From d8183de9b38a6a168609e2d4894232414414a07d Mon Sep 17 00:00:00 2001
From: shreyas <shreyas@erpnext.com>
Date: Wed, 18 May 2016 18:33:19 +0530
Subject: [PATCH 2/6] [Fix] Added new folder named production and moved
 production ansible script

---
 playbooks/install.py                                  | 11 +++++------
 .../setup_production.yml => production/install.yml}   |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename playbooks/{develop/setup_production.yml => production/install.yml} (65%)

diff --git a/playbooks/install.py b/playbooks/install.py
index 74b5aa53..6894f8c3 100644
--- a/playbooks/install.py
+++ b/playbooks/install.py
@@ -66,7 +66,7 @@ def install_bench(args):
 	if args.develop:
 		run_playbook('develop/install.yml', sudo=True, extra_args=vars(args))
 	elif args.setup_production:
-		run_playbook('develop/setup_production.yml', sudo=True, extra_args=vars(args))
+		run_playbook('production/install.yml', sudo=True, extra_args=vars(args))
 
 def install_python27():
 	version = (sys.version_info[0], sys.version_info[1])
@@ -197,7 +197,7 @@ def run_playbook(playbook_name, sudo=False, extra_args=None):
 	if sudo:
 		args.extend(['--become', '--become-user=frappe'])
 
-	if extra_args.get('run_verbose'):
+	if extra_args.get('verbosity'):
 		args.append('-vvvv')
 
 	success = subprocess.check_call(args, cwd=os.path.join(bench_repo, 'playbooks'))
@@ -220,10 +220,9 @@ def parse_commandline_args():
 
 	parser.add_argument('--site', dest='site', action='store', default='site1.local',
 		help='Specifiy name for your first ERPNext site')
-
-	# Hidden arguments to the argsparse
-	parser.add_argument('--run-verbose', dest='run_verbose', action='store_true', default=False,
-		help=argparse.SUPPRESS)
+		
+	parser.add_argument('--verbose', dest='verbosity', action='store_true', default=False,
+		help='Run the script in verbose mode')
 
 	# To enable testing of script using Travis, this should skip the prompt
 	parser.add_argument('--run-travis', dest='run_travis', action='store_true', default=False,
diff --git a/playbooks/develop/setup_production.yml b/playbooks/production/install.yml
similarity index 65%
rename from playbooks/develop/setup_production.yml
rename to playbooks/production/install.yml
index 52448e70..a3fae22d 100644
--- a/playbooks/develop/setup_production.yml
+++ b/playbooks/production/install.yml
@@ -2,13 +2,13 @@
   - hosts: localhost
 
   # Install the common pre-requisites for the setting up bench
-  - include: install.yml
+  - include: ../develop/install.yml
 
   # Install the production environment
-  - include: includes/setup_prod_env.yml
+  - include: ../develop/includes/setup_prod_env.yml
 
   # Setup Bench for production environment
-  - include: includes/setup_bench_production.yml
+  - include: ../develop/includes/setup_bench_production.yml
 
   # Setup SELinux Policy, Optional can be done later
   # - include: includes/setup_selinux_policy.yml

From 3939787243ec028eabe3e5a9b8d2b944e71576d0 Mon Sep 17 00:00:00 2001
From: shreyas <shreyas@erpnext.com>
Date: Wed, 18 May 2016 18:53:01 +0530
Subject: [PATCH 3/6] [Fix] Moved all production scripts under production
 folder

---
 playbooks/install.py                                          | 2 +-
 .../includes/setup_bench_production.yml                       | 0
 playbooks/{develop => production}/includes/setup_prod_env.yml | 0
 playbooks/production/install.yml                              | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename playbooks/{develop => production}/includes/setup_bench_production.yml (100%)
 rename playbooks/{develop => production}/includes/setup_prod_env.yml (100%)

diff --git a/playbooks/install.py b/playbooks/install.py
index 6894f8c3..7ebb5583 100644
--- a/playbooks/install.py
+++ b/playbooks/install.py
@@ -220,7 +220,7 @@ def parse_commandline_args():
 
 	parser.add_argument('--site', dest='site', action='store', default='site1.local',
 		help='Specifiy name for your first ERPNext site')
-		
+
 	parser.add_argument('--verbose', dest='verbosity', action='store_true', default=False,
 		help='Run the script in verbose mode')
 
diff --git a/playbooks/develop/includes/setup_bench_production.yml b/playbooks/production/includes/setup_bench_production.yml
similarity index 100%
rename from playbooks/develop/includes/setup_bench_production.yml
rename to playbooks/production/includes/setup_bench_production.yml
diff --git a/playbooks/develop/includes/setup_prod_env.yml b/playbooks/production/includes/setup_prod_env.yml
similarity index 100%
rename from playbooks/develop/includes/setup_prod_env.yml
rename to playbooks/production/includes/setup_prod_env.yml
diff --git a/playbooks/production/install.yml b/playbooks/production/install.yml
index a3fae22d..039c07dc 100644
--- a/playbooks/production/install.yml
+++ b/playbooks/production/install.yml
@@ -5,10 +5,10 @@
   - include: ../develop/install.yml
 
   # Install the production environment
-  - include: ../develop/includes/setup_prod_env.yml
+  - include: includes/setup_prod_env.yml
 
   # Setup Bench for production environment
-  - include: ../develop/includes/setup_bench_production.yml
+  - include: includes/setup_bench_production.yml
 
   # Setup SELinux Policy, Optional can be done later
   # - include: includes/setup_selinux_policy.yml

From 18f291ae21c0026e09896d80403efaaec03325f4 Mon Sep 17 00:00:00 2001
From: shreyas <shreyas@erpnext.com>
Date: Mon, 23 May 2016 15:45:17 +0530
Subject: [PATCH 4/6] [Fix] Moved nginx and frappe_selinux templates to
 production

---
 playbooks/develop/ubuntu.yml                                  | 2 +-
 playbooks/{develop => production}/templates/default_nginx.j2  | 0
 playbooks/{develop => production}/templates/frappe_selinux.te | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename playbooks/{develop => production}/templates/default_nginx.j2 (100%)
 rename playbooks/{develop => production}/templates/frappe_selinux.te (100%)

diff --git a/playbooks/develop/ubuntu.yml b/playbooks/develop/ubuntu.yml
index 028b5a47..7a731d35 100644
--- a/playbooks/develop/ubuntu.yml
+++ b/playbooks/develop/ubuntu.yml
@@ -2,7 +2,7 @@
 - hosts: localhost
   vars:
     bench_repo_path: "/usr/local/frappe/bench-repo"
-    bench_path: "/home/{{ ansible_user_id }}/benches/frappe-bench"
+    bench_path: "/home/{{ ansible_user_id }}/frappe/frappe-bench"
     mysql_config_template: "templates/simple_mariadb_config.cnf"
     mysql_conf_dir: /etc/mysql/conf.d/
     wkhtmltopdf_version: 0.12.2.1
diff --git a/playbooks/develop/templates/default_nginx.j2 b/playbooks/production/templates/default_nginx.j2
similarity index 100%
rename from playbooks/develop/templates/default_nginx.j2
rename to playbooks/production/templates/default_nginx.j2
diff --git a/playbooks/develop/templates/frappe_selinux.te b/playbooks/production/templates/frappe_selinux.te
similarity index 100%
rename from playbooks/develop/templates/frappe_selinux.te
rename to playbooks/production/templates/frappe_selinux.te

From 0e754c53ab0dc024acc9c8cf8916ead765c13165 Mon Sep 17 00:00:00 2001
From: shreyas <shreyas@erpnext.com>
Date: Mon, 23 May 2016 13:00:00 +0530
Subject: [PATCH 5/6] [Testing] Branch for testing purpose

---
 playbooks/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/install.py b/playbooks/install.py
index 7ebb5583..2c360667 100644
--- a/playbooks/install.py
+++ b/playbooks/install.py
@@ -107,7 +107,7 @@ def clone_bench_repo():
 	})
 
 	success = run_os_command(
-		{'git': 'git clone https://github.com/frappe/bench {bench_repo} --depth 1 --branch develop'.format(bench_repo=bench_repo)}
+		{'git': 'git clone https://github.com/shreyasp/bench {bench_repo} --depth 1 --branch test-ansible-installer'.format(bench_repo=bench_repo)}
 	)
 
 	return success

From 83adbd824da3e8755753db1581e8ac13532ffb39 Mon Sep 17 00:00:00 2001
From: shreyas <shreyas@erpnext.com>
Date: Mon, 23 May 2016 16:26:13 +0530
Subject: [PATCH 6/6] [Fix] Added seperate ansible script for setting up
 development environment

---
 playbooks/develop/centos.yml                  |  6 ++++-
 playbooks/develop/includes/setup_bench.yml    | 22 -------------------
 playbooks/develop/includes/setup_dev_env.yml  | 22 +++++++++++++++++++
 playbooks/develop/macosx.yml                  |  3 +++
 playbooks/develop/ubuntu.yml                  |  4 ++++
 .../includes/setup_bench_production.yml       |  2 +-
 6 files changed, 35 insertions(+), 24 deletions(-)
 create mode 100644 playbooks/develop/includes/setup_dev_env.yml

diff --git a/playbooks/develop/centos.yml b/playbooks/develop/centos.yml
index 44e12e98..91e7fde7 100644
--- a/playbooks/develop/centos.yml
+++ b/playbooks/develop/centos.yml
@@ -47,7 +47,7 @@
       - tk-devel
 
     #   To ensure that ansible_lsb is set
-      - redhat-lsb-core  
+      - redhat-lsb-core
     become: yes
     become_user: root
 
@@ -62,3 +62,7 @@
 
   # setup frappe-bench
   - include: includes/setup_bench.yml
+
+  # setup development environment
+  - include: includes/setup_dev_env.yml
+    when: not setup_production
diff --git a/playbooks/develop/includes/setup_bench.yml b/playbooks/develop/includes/setup_bench.yml
index 71961081..ee5cc245 100644
--- a/playbooks/develop/includes/setup_bench.yml
+++ b/playbooks/develop/includes/setup_bench.yml
@@ -26,25 +26,3 @@
     args:
       creates: "{{ bench_path }}/apps/frappe"
       chdir: "{{ bench_path }}"
-
-  # setup procfile
-  - name: setup procfile
-    command: bench setup socketio
-    args:
-      creates: "{{ bench_path }}/node_modules"
-      chdir: "{{ bench_path }}"
-
-  # setup procfile
-  - name: setup procfile
-    command: bench setup procfile
-    args:
-      creates: "{{ bench_path }}/Procfile"
-      chdir: "{{ bench_path }}"
-
-
-  # setup config for redis/socketio
-  - name: setup redis
-    command: bench setup redis
-    args:
-      creates: "{{ bench_path }}/config/redis_socketio.conf"
-      chdir: "{{ bench_path }}"
diff --git a/playbooks/develop/includes/setup_dev_env.yml b/playbooks/develop/includes/setup_dev_env.yml
new file mode 100644
index 00000000..3b54c2af
--- /dev/null
+++ b/playbooks/develop/includes/setup_dev_env.yml
@@ -0,0 +1,22 @@
+---
+ # Setup Socketio
+ - name: setup procfile
+   command: bench setup socketio
+   args:
+     creates: "{{ bench_path }}/node_modules"
+     chdir: "{{ bench_path }}"
+
+ # Setup Procfile
+ - name: setup procfile
+   command: bench setup procfile
+   args:
+     creates: "{{ bench_path }}/Procfile"
+     chdir: "{{ bench_path }}"
+
+
+ # Setup Redis env for RQ
+ - name: setup redis
+   command: bench setup redis
+   args:
+     creates: "{{ bench_path }}/config/redis_socketio.conf"
+     chdir: "{{ bench_path }}"
diff --git a/playbooks/develop/macosx.yml b/playbooks/develop/macosx.yml
index fbc0418b..97174814 100644
--- a/playbooks/develop/macosx.yml
+++ b/playbooks/develop/macosx.yml
@@ -29,3 +29,6 @@
   # setup frappe-bench
   - include: includes/setup_bench.yml
 
+  # setup development environment
+  - include: includes/setup_dev_env.yml
+    when: not setup_production
diff --git a/playbooks/develop/ubuntu.yml b/playbooks/develop/ubuntu.yml
index 7a731d35..6df197c3 100644
--- a/playbooks/develop/ubuntu.yml
+++ b/playbooks/develop/ubuntu.yml
@@ -70,3 +70,7 @@
 
   # setup frappe-bench
   - include: includes/setup_bench.yml
+
+  # setup development environment
+  - include: includes/setup_dev_env.yml
+    when: not setup_production
diff --git a/playbooks/production/includes/setup_bench_production.yml b/playbooks/production/includes/setup_bench_production.yml
index bf181b01..11428024 100644
--- a/playbooks/production/includes/setup_bench_production.yml
+++ b/playbooks/production/includes/setup_bench_production.yml
@@ -1,7 +1,7 @@
 ---
   - hosts: localhost
     vars:
-      bench_path: "/home/{{ ansible_user_id }}/benches/frappe-bench"
+      bench_path: "/home/{{ ansible_user_id }}/frappe/frappe-bench"
 
     tasks: