From 7eb5e5704738d3055c3e8827f46da707ab72aaf8 Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Sat, 22 Sep 2018 15:56:03 -0400
Subject: [PATCH] fix color issues with uninstaller

---
 README.md    | 62 +++++++++++++++++++++++++++++++++++++++++++---------
 install.sh   |  4 ++--
 uninstall.sh | 12 +++++-----
 3 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index ee76826..f558e69 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,61 @@
-# Django Setup for CentOS 7
+# Django Installer for CentOS 7
 ## Quick Install
 ```bash
-vim vars
+$ git clone https://gitlab.ducoterra.net/server/django_installer.git
+$ cd django_installer
+$ vim vars
 ```
 
 ```bash
 # django project settings
-export user="centos" <-- change to your user
-export projectname="mysite"
-export hostname="centos.duco.net" <-- change to your hostname
-export letsencrypt=False
+# django project settings
+export user="centos"                <---- set to your user (can use nginx)
+export projectname="mysite"         <---- set to your project name
+# TODO:
+# change hostname to an array:
+# (hostname1.net hostname2.net hostname2.net)
+export hostname="centos.duco.net"   <---- set to your hostname (ip or domain)
+export letsencrypt=False            <---- not working yet
 ```
 
 ```bash
-sudo ./install.sh
+$ sudo ./install.sh
+Installing dependencies
+    Installing gcc
+	Installing wget
+	Installing nginx
+	Installing libsqlite3x-devel.x86_64
+	Installing postgresql-server
+	Installing postgresql-devel
+	Installing postgresql-contrib
+	Installing bzip2-devel
+	Installing zlib-devel
+	Installing libffi-devel
+	Installing openssl-devel
+	Installing policycoreutils-python.x86_64
+Installing Python
+	Configure
+	Make
+	Make altinstall
+	Upgrading pip
+	Installing virtualenv
+Starting Django project
+	Creating venv
+	Installing django
+	Installing gunicorn
+	Installing psycopg2-binary
+	Starting django project
+	Collecting static
+	Making migrations
+	Migrating
+Setting up gunicorn
+	Starting gunicorn
+	Enabling gunicorn at startup
+Configuring Nginx
+	Starting nginx
+	Enabling nginx
+Done!
+$ 
 ```
 
 Done!
@@ -69,7 +111,7 @@ In order for this script to work its magic you'll need a few packages provided b
 ```bash
 # check if root
 if [[ $EUID -ne 0 ]]; then
-   echo -e "This script must be run as root" 
+   echo -e "This script must be run as root"
    exit 1
 fi
 cd /root/
@@ -246,7 +288,7 @@ Next the script starts the Django project. You'll notice that the project struct
 │    └── manage.py
 └──  venv/
 ```
-When making changes to nginx or gunicorn it's important to keep this structure in mind. There are 3 folders called ```$projectname```. 
+When making changes to nginx or gunicorn it's important to keep this structure in mind. There are 3 folders called ```$projectname```.
 
 After this, the script updates allowed hosts, collects static, and makes migrations.
 
@@ -295,4 +337,4 @@ if [ ! $user = "nginx" ] ; then
     sed -i "s/user nginx/user $user nginx/" /etc/nginx/nginx.conf
 fi
 ```
-Which inserts the specified user (if not nginx) into nginx.conf. The script finishes by enabling gunicorn and nginx at startup.
\ No newline at end of file
+Which inserts the specified user (if not nginx) into nginx.conf. The script finishes by enabling gunicorn and nginx at startup.
diff --git a/install.sh b/install.sh
index e4c25cb..aea7cd0 100755
--- a/install.sh
+++ b/install.sh
@@ -8,7 +8,7 @@ source ./vars
 
 # check if root
 if [[ $EUID -ne 0 ]]; then
-   echo -e "This script must be run as root" 
+   echo -e "This script must be run as root"
    exit 1
 fi
 cd /root/
@@ -288,4 +288,4 @@ systemctl enable nginx 1>> $nginxlogloc 2>> $nginxlogloc
 tput setaf 2
 echo -e "Done! Navigate to $hostname to access the site. Logs can be found in $logdir"
 tput setaf 9
-exit 0
\ No newline at end of file
+exit 0
diff --git a/uninstall.sh b/uninstall.sh
index f485089..6a8dfdc 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -4,7 +4,7 @@ source ./vars
 # remove nginx conf
 tput setaf 2
 echo "Uninstalling nginx"
-tput setaf 0
+tput setaf 9
 systemctl stop nginx 1> /dev/null 2> /dev/null
 systemctl disable nginx 1> /dev/null 2> /dev/null
 rm -f /etc/nginx/conf.d/$projectname.conf
@@ -12,7 +12,7 @@ rm -f /etc/nginx/conf.d/$projectname.conf
 # remove gunicorn
 tput setaf 2
 echo "Uninstalling gunicorn"
-tput setaf 0
+tput setaf 9
 systemctl disable gunicorn 1> /dev/null 2> /dev/null
 systemctl stop gunicorn 1> /dev/null 2> /dev/null
 rm -f /etc/systemd/system/gunicorn.service
@@ -20,19 +20,19 @@ rm -f /etc/systemd/system/gunicorn.service
 # remove project
 tput setaf 2
 echo "Removing Django project"
-tput setaf 0
+tput setaf 9
 rm -rf /home/$user/$projectname
 
 # remove python
 tput setaf 2
 echo "Uninstalling python"
-tput setaf 0
+tput setaf 9
 rm -rf $pyinstalldir
 
 # remove yum dependencies
 tput setaf 2
 echo "Uninstalling dependencies"
-tput setaf 0
+tput setaf 9
 packages=(gcc wget nginx libsqlite3x-devel.x86_64 postgresql-server postgresql-devel postgresql-contrib bzip2-devel zlib-devel libffi-devel openssl-devel policycoreutils-python.x86_64)
 for package in ${packages[@]};
 do
@@ -41,4 +41,4 @@ do
     if [ $? -ne 0 ] ; then
         echo -e "\tyum failed to remove $package."
     fi
-done
\ No newline at end of file
+done