add shebang

This reverts commit 650002bfe8.

README.md

@@ -1,4 +1,4 @@
-# Django Setup for CentOS 7
+# Django Setup for Raspbian Jessie
 ## 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
-if [ $? -ne 0 ] ; then
-	echo -e "firewall failed to update port 443 correctly, (this may not be an issue). $firelogmsg"
-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
+    fi
+done
 ```
 
-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]/
+├── [config]/
-│    ├── [projectname]/
+│   ├── __init__.py
-│    │   ├── __init__.py
+│   ├── settings.py
-│    │   ├── settings.py
+│   ├── urls.py
-│    │   ├── urls.py
+│   └── wsgi.py
-│    │   └── wsgi.py
+├── manage.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```. 
+When making changes to nginx or gunicorn it's important to keep this structure in mind.
 
-After this, the script updates allowed hosts, collects static, and makes migrations.
+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

@@ -1,17 +1,31 @@
+#!/bin/bash
+
 ################################################################################s
 # Dependencies
 # Installs Dependencies automatically
 ################################################################################
 
-# source vars
-source ./vars
-
 # check if root
-if [[ $EUID -ne 0 ]]; then
+if [ $EUID -ne 0 ] ; then
     echo -e "This script must be run as root"
     exit 1
 fi
-cd /root/
+
+# source vars
+source vars
+
+if [[ $user == "" ]] ; then
+    echo -e "User missing from vars."
+    exit 1
+fi
+if [[ $projectname == "" ]] ; then
+    echo -e "Project Name missing from vars."
+    exit 1
+fi
+if [[ $hostname == "" ]] ; then
+    echo -e "Hostname missing from vars."
+    exit 1
+fi
 
 tput setaf 2
 echo -e "Installing dependencies"
@@ -19,47 +33,35 @@ tput setaf 9
 # create necessary dirs
 if [ ! -d $logdir ] ; then
     mkdir $logdir
-fi
+fi;
-
-if [ $install_epel_release=True ] ; then
-    yum -y install epel-release 1>> $yumlogloc 2>> $yumlogloc 3>> $yumlogloc
-fi
 
 # 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 libpq-dev);
+echo -e "\tRunning apt update";
+apt update 1> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc;
 for package in ${packages[@]};
 do
     echo -e "\tInstalling $package"
-    yum -y install $package 1>> $yumlogloc 2>> $yumlogloc 3>> $yumlogloc
+    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
 
 # firewall
-ports=(80 443)
+ports=(22 80 443)
 for port in ${ports[@]};
 do
-    echo -e "firewall-cmd --zone=public --add-port=$port/tcp --permanent" > $firelogloc
+    echo -e "ufw allow $port/tcp" 1>> $firelogloc 2>> $firelogloc
-    firewall-cmd --zone=public --add-port=$port/tcp --permanent 1>> $firelogloc 2>> $firelogloc
+    ufw allow $port/tcp 1>> $firelogloc 2>> $firelogloc
     if [ $? -ne 0 ] ; then
-    	echo -e "\tfirewall failed to update port $port correctly (this may not be an issue). $firelogmsg"
+    	echo -e "\tfirewall failed to update port $port correctly. $firelogmsg"
+        exit 1
     fi
 done
-
+echo -e "\tEnabling ufw"
-echo -e "firewall-cmd --reload" >> $firelogloc
+ufw --force enable 1>> $firelogloc 2>> $firelogloc
-firewall-cmd --reload 1>> $firelogloc 2>> $firelogloc
-if [ $? -ne 0 ] ; then
-	echo -e "\tfirewall 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
 
 ################################################################################
 # Python
@@ -199,9 +201,9 @@ fi
 
 if [ $usegit = True ] ; then
     echo -e "\tCloning django project"
-    ssh-agent bash -c 'ssh-add $gitkey 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
     git init 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
     git remote add origin $giturl 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
+    ssh-agent bash -c 'ssh-add $gitkey 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;
     git pull origin master 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;'
     echo -e "\tInstalling pip requirements"
     pip install -r requirements.txt 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc
@@ -250,7 +252,7 @@ After=network.target
 
 [Service]
 User=$user
-Group=nginx
+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

reset.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 ################################################################################
 #                          Performs a QUICK uninstall                          #
 #                       - Does not uninstall dependencies                      #
@@ -5,7 +7,7 @@
 ################################################################################
 
 # source vars
-source ./vars
+source vars
 
 # remove nginx conf
 tput setaf 2
@@ -22,9 +24,3 @@ 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
-
-# remove project
-tput setaf 2
-echo "Removing Django project"
-tput setaf 9
-rm -rf /home/$user/$projectname

uninstall.sh

@@ -1,9 +1,11 @@
+#!/bin/bash
+
 ################################################################################
 #                           Performs a FULL uninstall                          #
 ################################################################################
 
 # source vars
-source ./vars
+source vars
 
 # remove nginx conf
 tput setaf 2
@@ -37,12 +39,12 @@ rm -rf $pyinstalldir
 tput setaf 2
 echo "Uninstalling dependencies"
 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)
+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 "\tRemoving $package"
-    yum -y erase $package 1>> /dev/null 2>> /dev/null 3>> /dev/null
+    apt purge -y $package 1>> /dev/null 2>> /dev/null 3>> /dev/null
     if [ $? -ne 0 ] ; then
-        echo -e "\tyum failed to remove $package."
+        echo -e "\tapt failed to remove $package."
     fi
 done

vars

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # django project settings
 export user=""
 export projectname=""
@@ -5,12 +7,11 @@ export hostname=""
 export usegit=False         # if you have a django git project
 export giturl=""            # url for git project
 export gitkey=""            # IdentityFile
-install_epel_release=False
 
 # general install settings
 export logdir="/var/log/djangosetup/"
-export yumlogloc=$logdir"yum.log"
+export aptlogloc=$logdir"apt.log"
-export yumlogmsg="See $yumlogloc for more info."
+export aptlogmsg="See $aptlogloc for more info."
 export firelogloc=$logdir"firewall.log"
 export firelogmsg="See $firelogloc for more info."
 export pylogloc=$logdir"python.log"