log create project dir to pylogloc

This reverts commit 650002bfe8.

README.md

@@ -1,4 +1,4 @@
-# Django Setup for CentOS 7
+# Django Setup for Debian 9, Ubuntu. 18.04, and Raspbian Stretch
 ## Install
 ```bash
 vim vars
@@ -15,20 +15,23 @@ export gitkey=""            <-- put the path to the ssh key git will use here
 ```
 
 ```bash
-sudo ./install.sh
+sudo -s                     <-- you must be root to run script
+./install.sh
 ```
 
 ## Reset
 If anything goes wrong with the project and you don't want to perform a full uninstall:
 ```bash
-sudo ./reset
+sudo -s
+./reset
 ```
 will reset the project but leave the dependencies installed. You can rerun the installer with different variables to fix what was incorrect. WARNING: This will delete your project (including your database)
 
 ## Uninstall
 To completely remove every trace of the project from your server:
 ```bash
-sudo ./uninstall
+sudo -s
+./uninstall
 ```
 This will completely remove everything.
 
@@ -37,18 +40,15 @@ This will completely remove everything.
 ### vars
 ```bash
 # Django project settings
-user="centos"
+user=""
-projectname="mysite"
+projectname=""
-hostname="centos.duco.net"
+hostname=""
 letsencrypt=False
 
-# set True if CentOS minimal install
-install_epel_release=False
-
 # general install settings
 logdir="/var/log/djangosetup/"
-yumlogloc=$logdir"yum.log"
+aptlogloc=$logdir"apt.log"
-yumlogmsg="See $yumlogloc for more info."
+aptlogmsg="See $aptlogloc for more info."
 firelogloc=$logdir"firewall.log"
 firelogmsg="See $firelogloc for more info."
 pylogloc=$logdir"python.log"
@@ -72,15 +72,11 @@ My recommendation is to use nginx as the user. The installer takes care of creat
 
 The projectname variable can be whatever you want. When Django starts the project it will use this name.
 
-The hostname will be inserted into "ALLOWED_HOSTS" in your app settings. Multiple hosts are not supported at the moment so set this to the address you'll test with. You can add additional hosts by manually editing ```settings.py```.
+The hostname will be added as an environment variable for gunicorn.  Multiple hosts are not supported at the moment so set this to the address you'll test with. You can add additional hosts by manually editing ```settings.py```.
-
-```install_epel_release=True```
-
-If you are installing this on a system with the minimal CentOS build you'll need install_epel_release to be True. ```epel_release``` installs nginx. Kinda hard to run the site without that.
 
 ## Install
 ### Dependencies
-In order for this script to work its magic you'll need a few packages provided by Yum. This part is likely to break due to Yum's inconsistency accross distributions, firewall and proxy configurations, and whether CentOS had its morning coffee.
+In order for this script to work its magic you'll need a few packages provided by apt.
 
 ```bash
 # check if root
@@ -97,61 +93,43 @@ tput setaf 0
 if [ ! -d $logdir ] ; then
 	mkdir $logdir
 fi
-if [ $install_epel_release = True ] ; then
-    yum -y install epel-release 1>> $yumlogloc 2>> $yumlogloc 3>> $pylogloc
-fi
 ```
 
-The first part of the script is fairly straight forward. If you aren't root user, the installer can't use yum and won't work. After checking if you are the root user it creates the necessary directories to prevent future complaints and installs the aforementioned epel-release package if you want it.
+The first part of the script is fairly straight forward. If you aren't root user, the installer can't use apt and won't work. After checking if you are the root user it creates the necessary directories to prevent future complaints.
 
 ```bash
 # install dependencies
-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)
+packages=(gcc wget nginx ufw make sqlite3 bzip2 openssl libffi-dev libssl-dev libsqlite3-dev zlib1g-dev libbz2-dev)
 for package in ${packages[@]};
 do
     echo -e "\tInstalling $package"
-    yum -y install $package 1>> $yumlogloc 2>> $yumlogloc 3>> $yumlogloc
+    touch $aptlogloc
+    apt install -y $package 1>> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc
     if [ $? -ne 0 ] ; then
-        echo -e "yum failed to install $package. $yumlogmsg"
+        echo -e "apt failed to install $package. $aptlogmsg"
         exit 1
     fi
 done
 ```
 
-The next part of the script installs yum dependencies. The script verifies that the installation goes smoothly and exits if an error occurs.
+The next part of the script installs apt dependencies. The script verifies that the installation goes smoothly and exits if an error occurs.
 
 ### Firewall
 ```bash
-# set firewall
+# firewall
-echo -e "firewall-cmd --zone=public --add-port=80/tcp --permanent" > $firelogloc
+ports=(22 80 443)
-firewall-cmd --zone=public --add-port=80/tcp --permanent >> $firelogloc
+for port in ${ports[@]};
-if [ $? -ne 0 ] ; then
+do
-	echo -e "firewall failed to update port 80 correctly (this may not be an issue). $firelogmsg"
+    echo -e "ufw allow $port/tcp" > $firelogloc
-fi
+    ufw allow $port/tcp 1>> $firelogloc 2>> $firelogloc
-
+    if [ $? -ne 0 ] ; then
-echo -e "firewall-cmd --zone=public --add-port=443/tcp --permanent" >> $firelogloc
+    	echo -e "\tfirewall failed to update port $port correctly. $firelogmsg"
-firewall-cmd --zone=public --add-port=443/tcp --permanent >> $firelogloc
+        exit 1
-if [ $? -ne 0 ] ; then
+    fi
-	echo -e "firewall failed to update port 443 correctly, (this may not be an issue). $firelogmsg"
+done
-fi
-
-echo -e "firewall-cmd --reload" >> $firelogloc
-firewall-cmd --reload >> $firelogloc
-if [ $? -ne 0 ] ; then
-	echo -e "firewall failed to reload, (this may not be an issue). $firelogmsg"
-fi
-
-echo -e "semanage permissive -a httpd_t" >> $firelogloc
-semanage permissive -a httpd_t >> $firelogloc
-if [ $? -ne 0 ] ; then
-	echo -e "semanage failed to set permissive. See $firelogmsg"
-	exit 1
-fi
 ```
 
-The firewall commands are specific to a CentOS 7 minimal install. You may not need them. The installer doesn't really care if they fail because they aren't mission critical. It'll yell at you and that's about it.
+The next part of the script opens the necessary ports through ufw.
-
-The **semanage** command fixes an issue where the websocket would be inaccessible after an install.
 
 ### Python
 ```bash
@@ -252,19 +230,19 @@ fi
 ```
 Next the script starts the Django project. You'll notice that the project structure looks like this:
 ```
-[projectname]/
-├──  [projectname]/
-│    ├── [projectname]/
-│    │   ├── __init__.py
-│    │   ├── settings.py
-│    │   ├── urls.py
-│    │   └── wsgi.py
-│    └── 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```. 
 
-After this, the script updates allowed hosts, collects static, and makes migrations.
+[projectname]/
+├── [config]/
+│   ├── __init__.py
+│   ├── settings.py
+│   ├── urls.py
+│   └── wsgi.py
+├── manage.py
+└── venv/
+```
+When making changes to nginx or gunicorn it's important to keep this structure in mind.
+
+After starting the Django project, the script updates allowed hosts, collects static, and makes migrations.
 
 ### Gunicorn
 ```bash
@@ -275,7 +253,7 @@ After=network.target
 
 [Service]
 User=$user
-Group=nginx
+Group=www-data
 WorkingDirectory=/home/$user/$projectname/$projectname
 ExecStart=/home/$user/$projectname/venv/bin/gunicorn --workers 3 --bind unix:/home/$user/$projectname/$projectname.sock $projectname.wsgi:application
 

install.sh

@@ -0,0 +1,233 @@
+#!/bin/bash
+
+################################################################################s
+# Dependencies
+# Installs Dependencies automatically
+################################################################################
+
+# check if root
+if [ $EUID -ne 0 ] ; then
+    echo -e "This script must be run as root"
+    exit 1
+fi
+
+# source vars
+source vars
+
+echo -e "Installing dependencies"
+# create necessary dirs
+if [ ! -d $logdir ] ; then
+    mkdir $logdir
+fi;
+
+# install dependencies
+echo -e "\tRunning apt update";
+apt update 1> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc;
+for package in ${packages[@]};
+do
+    echo -e "\tInstalling $package"
+    apt install -y $package 1>> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc
+    if [ $? -ne 0 ] ; then
+        echo -e "apt failed to install $package. $aptlogmsg"
+        exit 1
+    fi
+done
+
+###############################################################################
+# Sqlite3
+# Download and setup Sqlite3 and modules
+################################################################################
+echo -e "Installing Sqlite3"
+
+if [ ! -d sqlite ] ; then
+    # fetch Sqlite
+    wget -O sqlite.tar.gz $sqlink 1> $pylogloc 2>> $pylogloc 3>> $pylogloc
+    if [ $? -ne 0 ] ; then
+        echo -e "Failed to fetch sqlite, make sure wget is installed and $pylink is what you're after. $pylogmsg"
+        exit 1
+    fi
+
+    mkdir sqlite
+    tar xf sqlite.tar.gz -C sqlite --strip-components=1 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+    if [ $? -ne 0 ] ; then
+        echo -e "Failed to unzip sqlite. $pylogmsg"
+        exit 1
+    fi
+fi;
+
+cd sqlite
+if [ $? -ne 0 ] ; then
+    echo -e "Something went wrong while unzipping. $pylogmsg"
+    exit 1
+fi
+
+# install Sqlite3
+echo -e "\tConfigure"
+./configure 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+    echo -e "./configure failed. $pylogmsg"
+    exit 1
+fi
+
+echo -e "\tMake"
+make 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+    echo -e "make failed. $pylogmsg"
+    exit 1
+fi
+
+echo -e "\tMake install"
+make install 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+    echo -e "make install failed. $pylogmsg"
+    exit 1
+fi
+
+cd ..
+rm sqlite.tar.gz 1>> $pylogloc 2>> $pylogloc
+if [ $? -ne 0 ] ; then
+	echo -e "\tNot removing Sqlite3 tar.gz file."
+fi
+
+################################################################################
+# Python
+# Download and setup Python and modules
+################################################################################
+echo -e "Installing Python"
+
+if [ ! -d python ] ; then
+    wget -O python.tar.gz $pylink 1> $pylogloc 2>> $pylogloc 3>> $pylogloc
+    if [ $? -ne 0 ] ; then
+        echo -e "Failed to fetch python, make sure wget is installed and $pylink is what you're after. $pylogmsg"
+        exit 1
+    fi
+
+    mkdir python
+    tar xf python.tar.gz -C python --strip-components=1 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+    if [ $? -ne 0 ] ; then
+        echo -e "Failed to unzip python. $pylogmsg"
+        exit 1
+    fi
+fi
+
+cd python
+if [ $? -ne 0 ] ; then
+    echo -e "Something went wrong while unzipping. $pylogmsg"
+    exit 1
+fi
+
+# install Python
+echo -e "\tConfigure"
+./configure 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+    echo -e "./configure failed. $pylogmsg"
+    exit 1
+fi
+
+echo -e "\tMake"
+make 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+    echo -e "make failed. $pylogmsg"
+    exit 1
+fi
+
+echo -e "\tMake install"
+make install 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+    echo -e "make install failed. $pylogmsg"
+    exit 1
+fi
+
+# upgrade pip and install virtualenv
+echo -e "\tUpgrading pip"
+python3 -m pip install --upgrade pip 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+	echo -e "pip upgrade failed. $pylogmsg"
+    exit 1
+fi
+
+echo -e "\tInstalling virtualenv"
+python3 -m pip install virtualenv 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+if [ $? -ne 0 ] ; then
+	echo -e "installing virtualenv failed. $pylogmsg"
+    exit 1
+fi
+
+cd ..
+rm python.tar.gz 1>> $pylogloc 2>> $pylogloc
+if [ $? -ne 0 ] ; then
+	echo -e "\tNot removing Python tar.gz file."
+fi
+
+# create the sites directory
+echo -e "\tCreating project directory"
+mkdir /sites/ 1>> $pylogloc 2>> $pylogloc 3>> $pylogloc
+
+
+# ################################################################################
+# # Gunicorn
+# # configure gunicorn.conf file
+# ################################################################################
+# tput setaf 2
+# echo -e "Setting up gunicorn"
+# tput setaf 9
+# echo -e "
+# [Unit]
+# Description=gunicorn daemon
+# After=network.target
+
+# [Service]
+# User=$user
+# Group=www-data
+# WorkingDirectory=/home/$user/$projectname
+# ExecStart=/home/$user/$projectname/venv/bin/gunicorn --workers 3 --bind unix:/home/$user/$projectname/$projectname.sock config.wsgi:application
+# Environment=HOST=$hostname
+
+# [Install]
+# WantedBy=multi-user.target" > /etc/systemd/system/gunicorn.service
+# echo -e "\tStarting gunicorn"
+# systemctl daemon-reload > $gunicornlogloc
+# systemctl start gunicorn >> $gunicornlogloc
+# systemctl status gunicorn >> $gunicornlogloc
+# echo -e "\tEnabling gunicorn at startup"
+# systemctl enable gunicorn 1>> $gunicornlogloc 2>> $gunicornlogloc
+
+# ################################################################################
+# # Nginx
+# # configure nginx
+# ################################################################################
+# tput setaf 2
+# echo -e "Configuring Nginx"
+# tput setaf 9
+# echo -e "
+# server {
+#     listen 80;
+#     server_name $hostname;
+
+#     location = /favicon.ico { access_log off; log_not_found off; }
+#     location /static/ {
+#         root /home/$user/$projectname;
+#     }
+
+#     location / {
+#         proxy_set_header Host \$http_host;
+#         proxy_set_header X-Real-IP \$remote_addr;
+#         proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+#         proxy_set_header X-Forwarded-Proto \$scheme;
+#         proxy_pass http://unix:/home/$user/$projectname/$projectname.sock;
+#     }
+# }" > /etc/nginx/conf.d/$projectname.conf
+# # set the nginx user
+# if [ ! $user = "nginx" ] ; then
+#     sed -i "s/user nginx/user $user nginx/" /etc/nginx/nginx.conf
+# fi
+# echo -e "\tStarting nginx"
+# systemctl restart nginx >> $nginxlogloc
+# systemctl status nginx >> $nginxlogloc
+# echo -e "\tEnabling nginx"
+# 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

reset.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+################################################################################
+#                          Performs a QUICK uninstall                          #
+#                       - Does not uninstall dependencies                      #
+#                          - Does not remove python                            #
+################################################################################
+
+# source vars
+source vars
+
+# source vars
+source vars
+
+# remove python
+echo "Uninstalling Python"
+for dir in $(whereis python3 | tr " " "\n" | grep usr/local/bin | tr "\n" " "); 
+do rm -r $dir; 
+done;
+
+# remove sqlite
+echo "Uninstalling Sqlite3"
+for dir in $(whereis sqlite3 | tr " " "\n" | grep usr/local/bin | tr "\n" " "); 
+do rm -r $dir; 
+done;

uninstall.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+################################################################################
+#                           Performs a FULL uninstall                          #
+################################################################################
+
+# source vars
+source vars
+
+# remove python
+echo "Uninstalling Python"
+for dir in $(whereis python3 | tr " " "\n" | grep usr/local/bin | tr "\n" " "); 
+do rm -r $dir; 
+done;
+
+# remove sqlite
+echo "Uninstalling Sqlite3"
+for dir in $(whereis sqlite3 | tr " " "\n" | grep usr/local/bin | tr "\n" " "); 
+do rm -r $dir; 
+done;
+
+# remove yum dependencies
+echo "Uninstalling dependencies"
+for package in ${packages[@]};
+do
+    echo -e "\tRemoving $package"
+    apt purge -y $package 1>> /dev/null 2>> /dev/null 3>> /dev/null
+    if [ $? -ne 0 ] ; then
+        echo -e "\tapt failed to remove $package."
+    fi
+done

vars

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# django project settings
+export user=""
+export projectname=""
+export hostname=""
+export usegit=False         # if you have a django git project
+export giturl=""            # url for git project
+export gitkey=""            # IdentityFile
+
+# general install settings
+export logdir="/var/log/djangosetup/"
+export aptlogloc=$logdir"apt.log"
+export aptlogmsg="See $aptlogloc for more info."
+export firelogloc=$logdir"firewall.log"
+export firelogmsg="See $firelogloc for more info."
+export pylogloc=$logdir"python.log"
+export pylogmsg="See $pylogloc for more info."
+export djalogloc=$logdir"django.log"
+export djamsg="See $djalogloc for more info."
+export gunicornlogloc=$logdir"gunicorn.log"
+export nginxlogloc=$logdir"nginx.log"
+export gitlogloc=$logdir"git.log"
+export gitlogmsg="See $gitlogloc for more info."
+
+# python settings
+export pylink="https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz"
+export sqlink="https://sqlite.org/2019/sqlite-autoconf-3280000.tar.gz"
+export pyinstalldir="/usr/src/python37"
+
+# don't change this by hand
+export packages=(gcc wget nginx make bzip2 openssl libffi-dev libssl-dev libsqlite3-dev zlib1g-dev libbz2-dev libpq-dev);