Simplify checkout cases in provisioning

playbook.yml

@@ -57,8 +57,6 @@
           # Required for Ansible to setup DB
           - python3-mysqldb
 
-    - name: Setup dev deployment
-      block:
     - name: Check if running under Vagrant
       stat:
         path: /vagrant
@@ -70,7 +68,7 @@
         dest: '{{ project_dir }}'
       when: vagrant_dir.stat.exists == True
 
-      - name: Clone / update dev branch from main repo
+    - name: Clone / update branch from main repo
       git:
         repo: 'https://github.com/PEDASI/PEDASI.git'
         dest: '{{ project_dir }}'
@@ -78,47 +76,24 @@
         version: '{{ branch | default("dev") }}'
       when: vagrant_dir.stat.exists == False
 
-      - name: Copy dev settings
+    - name: Copy settings
       copy:
-          src: 'deploy/.env.dev'
+        src: '{{ env_file | default("deploy/.env.dev") }}'
         dest: '{{ project_dir }}/.env'
         owner: www-data
         group: www-data
         mode: 0600
 
-      when: production is not defined
-
-    - name: Setup production deployment
-      block:
-      - name: Clone / update master branch
-        git:
-          repo: 'https://github.com/PEDASI/PEDASI.git'
-          dest: '{{ project_dir }}'
-          accept_hostkey: yes
-          version: "{{ branch | default('master') }}"
-
-      - name: Copy production settings
-        copy:
-          src: 'deploy/.env.prod'
-          dest: '{{ project_dir }}/.env'
-          owner: www-data
-          group: www-data
-          mode: 0600
-
-      when: production is defined
-
     - name: Set permissions on manage.py
       file:
         path: '{{ project_dir }}/manage.py'
         mode: 0755
 
-    - name: Create virtualenv
-      command: python3 -m venv '{{ venv_dir }}' creates='{{ venv_dir }}'
-
     - name: Install pip requirements
       pip:
         requirements: '{{ project_dir}}/requirements.txt'
         virtualenv: '{{ venv_dir }}'
+        virtualenv_python: python3
 
     - name: Restart and enable MariaDB
       systemd: