From 377264e59dbf048b4c66e05b91da9849445cd980 Mon Sep 17 00:00:00 2001
From: Diana Lin <diana4lin@gmail.com>
Date: Sun, 15 Oct 2023 09:18:29 -0400
Subject: [PATCH] clean up playbook

---
 .github/workflows/deploy_bundle.yml | 1 +
 action.yml                          | 1 +
 ansible/tasks/python.yml            | 4 +++-
 deploy_bundle/tasks/python.yml      | 4 +++-
 templates/usage.html                | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy_bundle.yml b/.github/workflows/deploy_bundle.yml
index 70e5b3a..7e44915 100644
--- a/.github/workflows/deploy_bundle.yml
+++ b/.github/workflows/deploy_bundle.yml
@@ -46,6 +46,7 @@ jobs:
           python3 ansible.py
       - name: Run Ansible Playbook
         run: |
+          rm -rf .git
           cd deploy_bundle
           ansible-playbook nginx.yml
 
diff --git a/action.yml b/action.yml
index cf20db1..310f8d5 100644
--- a/action.yml
+++ b/action.yml
@@ -46,5 +46,6 @@ jobs:
           python3 ansible.py
       - name: Run Ansible Playbook
         run: |
+          rm -rf .git
           cd deploy_bundle
           ansible-playbook nginx.yml
diff --git a/ansible/tasks/python.yml b/ansible/tasks/python.yml
index 38752e6..7f7e234 100644
--- a/ansible/tasks/python.yml
+++ b/ansible/tasks/python.yml
@@ -9,10 +9,11 @@
     dest: /home/admin/app/
     src: ../../
     mode: "555"
+    owner: admin
 - name: Install venv requirements
   ansible.builtin.package:
     name:
-      - virtualenv
+      - python3-venv
       - python3-pip
       - python3-setuptools
     state: present
@@ -42,6 +43,7 @@
     dest: /etc/supervisor/conf.d/flaskapp.conf
     src: ../flaskapp.conf
     mode: "644"
+    owner: admin
   notify: Reload supervisor
 - name: Create supervisor log dir
   ansible.builtin.file:
diff --git a/deploy_bundle/tasks/python.yml b/deploy_bundle/tasks/python.yml
index 38752e6..7f7e234 100644
--- a/deploy_bundle/tasks/python.yml
+++ b/deploy_bundle/tasks/python.yml
@@ -9,10 +9,11 @@
     dest: /home/admin/app/
     src: ../../
     mode: "555"
+    owner: admin
 - name: Install venv requirements
   ansible.builtin.package:
     name:
-      - virtualenv
+      - python3-venv
       - python3-pip
       - python3-setuptools
     state: present
@@ -42,6 +43,7 @@
     dest: /etc/supervisor/conf.d/flaskapp.conf
     src: ../flaskapp.conf
     mode: "644"
+    owner: admin
   notify: Reload supervisor
 - name: Create supervisor log dir
   ansible.builtin.file:
diff --git a/templates/usage.html b/templates/usage.html
index 72f14b9..aedde09 100644
--- a/templates/usage.html
+++ b/templates/usage.html
@@ -5,7 +5,7 @@ <h1>{% block title %}Usage{% endblock %}</h1>
 
 {% block content %}
 <!--- This usage.md stores the instructions for bundle.zip, put through md to html parser --->
-<h2 id="deploy-my-hack-usage">Deploy My Hack usage</h2>
+<h2 id="deploy-my-hack-usage">How to use InfraBundle?</h2>
 <ol type="1">
   <li>Fill out the <a href="{{ url_for('deploy_form') }}">deployment settings</a> form to generate a bundle and extract the downloaded bundle containing deployment scripts</li>
 </ol>