Merge pull request #38 from tazboyz16/Dev

Dev
tazboyz16 · Aug 31, 2017 · b25e370 · b25e370
2 parents 13e9868 + 4664a03
commit b25e370
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 201 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,6 @@
-
-
 {
   "language": "shell",
   "group": "stable",
   "dist": "trusty",
   "os": "linux"
 }
-
-
diff --git a/README.md b/README.md
@@ -1,19 +1,4 @@
 # Ubuntu Server Auto Install 
-
-[![GitHub issues](https://img.shields.io/github/issues/tazboyz16/Ubuntu-Server-Auto-Install.svg?style=flat)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/issues)
-[![Release](https://img.shields.io/github/release/tazboyz16/Ubuntu-Server-Auto-Install.svg?style=flat)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases/latest)
-[![Download latest release](https://img.shields.io/github/downloads/tazboyz16/Ubuntu-Server-Auto-Install/latest/total.svg)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases/latest)
-[![Download total](https://img.shields.io/github/downloads/tazboyz16/Ubuntu-Server-Auto-Install/total.svg)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases)
-[![master](https://img.shields.io/badge/Master-stable-green.svg?maxAge=2592000)]()
-[![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]()
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=8A3H889FURE56&lc=US&item_name=Ubuntu%20Auto%20Install&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
-[![License](https://img.shields.io/badge/License-GNU%20GPL%20v3-blue.svg?style=flat)](http://www.gnu.org/licenses/gpl.html)     
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/c396aaee00d54efda805b5cc145bd824)](https://www.codacy.com/app/tazboyz_16/Ubuntu-Server-Auto-Install?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=tazboyz16/Ubuntu-Server-Auto-Install&amp;utm_campaign=Badge_Grade)
-[![Coverage Status](https://coveralls.io/repos/github/tazboyz16/Ubuntu-Server-Auto-Install/badge.svg?branch=master)](https://coveralls.io/github/tazboyz16/Ubuntu-Server-Auto-Install?branch=master)
-[![Build Status](https://travis-ci.org/tazboyz16/Ubuntu-Server-Auto-Install.svg?branch=master)](https://travis-ci.org/tazboyz16/Ubuntu-Server-Auto-Install)
-[![codebeat badge](https://codebeat.co/badges/2fcb06b2-a034-4f1f-a639-48887f0c47c3)](https://codebeat.co/projects/github-com-tazboyz16-ubuntu-server-auto-install-master)
-
-[![Feature Requests](https://github.com/tazboyz16/tazboyz16.github.io/raw/master/mFO0OuX.png)](http://feathub.com/tazboyz16/Ubuntu-Server-Auto-Install)
 
 Currently Using 16.04.2 LTS on my personal Server 64bit as of 8/2017  
 Also tested with [Codeanywhere](https://codeanywhere.com) for Ubuntu 14LTS, and on [Codenvy](https://codenvy.io) for ubuntu 16 installs        
@@ -37,6 +22,27 @@ Please see the wiki for futher information
 To download, go here:   
 [https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases/latest](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases/latest)    
 
-# Preview  
-[![Preview Example 1](https://github.com/tazboyz16/tazboyz16.github.io/raw/master/ZCzZzLf.png)](https://github.com/tazboyz16/tazboyz16.github.io/raw/master/ZCzZzLf.png)
+### Overall Status of Project 
+         
+Branch|Build|Coverage|Codacy Grade|...|...|...
+---|---|---|---|---|---|---
+Master | [![Build Status](https://travis-ci.org/tazboyz16/Ubuntu-Server-Auto-Install.svg?branch=master)](https://travis-ci.org/tazboyz16/Ubuntu-Server-Auto-Install) | [![Coverage Status](https://coveralls.io/repos/github/tazboyz16/Ubuntu-Server-Auto-Install/badge.svg?branch=master)](https://coveralls.io/github/tazboyz16/Ubuntu-Server-Auto-Install?branch=master) | [![Codacy Master Badge](https://api.codacy.com/project/badge/Grade/c396aaee00d54efda805b5cc145bd824?branch=master)](https://www.codacy.com/app/tazboyz_16/Ubuntu-Server-Auto-Install?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=tazboyz16/Ubuntu-Server-Auto-Install&amp;utm_campaign=Badge_Grade)
+Dev | [![Build Status](https://travis-ci.org/tazboyz16/Ubuntu-Server-Auto-Install.svg?branch=Dev)](https://travis-ci.org/tazboyz16/Ubuntu-Server-Auto-Install) | [![Coverage Status](https://coveralls.io/repos/github/tazboyz16/Ubuntu-Server-Auto-Install/badge.svg?branch=Dev)](https://coveralls.io/github/tazboyz16/Ubuntu-Server-Auto-Install?branch=Dev) | [![Codacy Master Badge](https://api.codacy.com/project/badge/Grade/c396aaee00d54efda805b5cc145bd824?branch=Dev)](https://www.codacy.com/app/tazboyz_16/Ubuntu-Server-Auto-Install?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=tazboyz16/Ubuntu-Server-Auto-Install&amp;utm_campaign=Badge_Grade)
+
+[![License](https://img.shields.io/badge/License-GNU%20GPL%20v3-blue.svg?style=flat)](http://www.gnu.org/licenses/gpl.html)
+[![GitHub Issues](https://img.shields.io/github/issues/tazboyz16/Ubuntu-Server-Auto-Install.svg?label=Issues&style=flat)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/issues)
+[![Latest Release Version](https://img.shields.io/github/release/tazboyz16/Ubuntu-Server-Auto-Install.svg?label=Latest-Release&style=flat)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases/latest)
+[![Latest Release Download](https://img.shields.io/github/downloads/tazboyz16/Ubuntu-Server-Auto-Install/latest/total.svg?label=Latest-Downloaded)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases/latest)
+[![Total Downloads](https://img.shields.io/github/downloads/tazboyz16/Ubuntu-Server-Auto-Install/total.svg?label=Total-Downloads)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/releases)
+
+
+[![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]()
 
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=8A3H889FURE56&lc=US&item_name=Ubuntu%20Auto%20Install&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
+[![Contributions Welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/tazboyz16/Ubuntu-Server-Auto-Install/issues)
+[![Feature Requests](https://github.com/tazboyz16/tazboyz16.github.io/raw/master/mFO0OuX.png)](http://feathub.com/tazboyz16/Ubuntu-Server-Auto-Install)
+
+
+### Preview  
+[![Preview Example 1](https://github.com/tazboyz16/tazboyz16.github.io/raw/master/ZCzZzLf.png)](https://github.com/tazboyz16/tazboyz16.github.io/raw/master/ZCzZzLf.png)
diff --git a/myapps/codeanywhere.sh b/myapps/codeanywhere.sh
@@ -10,6 +10,7 @@
 
 #THIS FILE IS ONLY USED FOR DEVELOP ON CODEANYWHERE.COM
 
+#https://github.com/dwyl/repo-badges
 #http://port-5050.ubuntu-server-auto-install-tazboyz16.codeanyapp.com
 apt update; apt upgrade -y --force-yes
 apt install systemd software-properties-common nano dialog debconf apt-transport-https debconf-utils -y

diff --git a/myapps/install/Apache2/000-default.conf b/myapps/install/Apache2/000-default.conf
@@ -4,18 +4,21 @@
 	#<Location />
 	#Order deny,allow
 	#Deny from all
-	#</Location>	
+	#</Location>
 	#RewriteEngine On
 	#RewriteRule ^/?(.*) https://www.example.com/$1 [R=301,L]
 
 	ServerName xxxDomainxxx
 	ServerAdmin xxxusernamexxx@xxxDomainxxx
 	DocumentRoot /var/www/html
-	
+
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
+	ProxyRequests off
+
    ### Listed with Default Port Numbers ###
+
 	<Location /couchpotato>
 	ProxyPass http://127.0.0.1:5050/couchpotato
 	ProxyPassReverse http://127.0.0.1/couchpotato
@@ -26,251 +29,118 @@
 	ProxyPass http://127.0.0.1:8112/
 	ProxyPassReverse http://127.0.0.1:8112/
 	</Location>
-	
+
 	<Location /emby>
 	ProxyPass http://127.0.0.1:8096/emby
 	ProxyPassReverse http://127.0.0.1/emby
-	</Location>	
+	</Location>
 
+	#failed to load htpc
 	<Location /HTPCManager>
 	ProxyPass http://127.0.0.1:8085/HTPCManager
 	ProxyPassReverse http://127.0.0.1/HTPCManager
 	</Location>
-
+
+	#http_root= / (just add whatever you want behind the backslash, save, and restart the service)
 	<Location /headphones>
 	ProxyPass http://127.0.0.1:8181/headphones
 	ProxyPassReverse http://127.0.0.1/headphones
-	</Location>	
+	</Location>
 
 	<Location /jackett>
 	ProxyPass http://127.0.0.1:9117/jackett
 	ProxyPassReverse http://127.0.0.1/jackett
 	</Location>
-	
+
 	<Location /lazylibrarian>
 	ProxyPass http://127.0.0.1:5299/lazylibrarian
 	ProxyPassReverse http://127.0.0.1/lazylibrarian
 	</Location>
-	
+
 	<Location /madsonic>
 	ProxyPass http://127.0.0.1:4040/madsonic
 	ProxyPassReverse http://127.0.0.1/madsonic
 	</Location>
-	
+
 	#not created yet under install scripts
 	#<Location /mopidy>
 	#ProxyPass http://127.0.0.1:6600/mopidy
 	#ProxyPassReverse http://127.0.0.1/mopidy
-	#</Location>	
-
-	<Location /mylar>
-	ProxyPass http://127.0.0.1:8090/mylar
-	ProxyPassReverse http://127.0.0.1/mylar
-	</Location>
-
-	<Location /nzbget>
-	ProxyPass http://127.0.0.1:6789/nzbget
-	ProxyPassReverse http://127.0.0.1/nzbget
-	</Location>	
-
-	<Location /ombi>
-	ProxyPass http://127.0.0.1:3579/ombi
-	ProxyPassReverse http://127.0.0.1/ombi
-	</Location>
-
-	<Location /plex>
-	ProxyPass http://127.0.0.1:32400/plex
-	ProxyPassReverse http://127.0.0.1/plex
-	</Location>		
-
-	<Location /plexpy>
-	ProxyPass http://127.0.0.1:8181/plexpy
-	ProxyPassReverse http://127.0.0.1/plexpy
-	</Location>
-
-	<Location /radarr>
-	ProxyPass http://127.0.0.1:7878/radarr
-	ProxyPassReverse http://127.0.0.1/radarr
-	</Location>		
-
-	#not created yet under install scripts
-	#<Location /sabnzbd>
-	#ProxyPass http://127.0.0.1:8080/sabnzbd
-	#ProxyPassReverse http://127.0.0.1/sabnzbd
 	#</Location>
-
-	<Location /shinobi>
-	ProxyPass http://127.0.0.1:8080/shinobi
-	ProxyPassReverse http://127.0.0.1/shinobi
-	</Location>		
-
-	<Location /sickrage>
-	ProxyPass http://127.0.0.1:8081/sickrage
-	ProxyPassReverse http://127.0.0.1/sickrage
-	</Location>
-
-	<Location /sinusbot>
-	ProxyPass http://127.0.0.1:8087/sinusbot
-	ProxyPassReverse http://127.0.0.1/sinusbot
-	</Location>	
-
-	<Location /sonarr>
-	ProxyPass http://127.0.0.1:8087/sonarr
-	ProxyPassReverse http://127.0.0.1/sonarr
-	</Location>		
-
-	<Location /ubooquity>
-	ProxyPass http://127.0.0.1:2202/ubooquity
-	ProxyPassReverse http://127.0.0.1/ubooquity
-	</Location>	
-
-	<Location /webmin>
-	ProxyPass http://127.0.0.1:10000/webmin
-	ProxyPassReverse http://127.0.0.1/webmin
-	</Location>		
-
-	<Location /webtools>
-	ProxyPass http://127.0.0.1:33400/webtools
-	ProxyPassReverse http://127.0.0.1/webtools
-	</Location>	
-
-</VirtualHost>
-
-<VirtualHost *:443>
-
-	##Redirect All To https - Uncomment below lines if necessary##
-	#<Location />
-	#Order deny,allow
-	#Deny from all
-	#</Location>	
-	#RewriteEngine On
-	#RewriteRule ^/?(.*) https://www.example.com/$1 [R=301,L]
 
-	ServerName xxxDomainxxx
-	ServerAdmin xxxusernamexxx@xxxDomainxxx
-	DocumentRoot /var/www/html
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-   ### Listed with Default Port Numbers ###
-	<Location /couchpotato>
-	ProxyPass http://127.0.0.1:5050/couchpotato
-	ProxyPassReverse http://127.0.0.1/couchpotato
-	</Location>
-
-	<Location /deluge>
-	RequestHeader append X-Deluge-Base "/deluge/"
-	ProxyPass http://127.0.0.1:8112/
-	ProxyPassReverse http://127.0.0.1:8112/
-	</Location>
-
-	<Location /emby>
-	ProxyPass http://127.0.0.1:8096/emby
-	ProxyPassReverse http://127.0.0.1/emby
-	</Location>	
-
-	<Location /HTPCManager>
-	ProxyPass http://127.0.0.1:8085/HTPCManager
-	ProxyPassReverse http://127.0.0.1/HTPCManager
-	</Location>
-
-	<Location /headphones>
-	ProxyPass http://127.0.0.1:8181/headphones
-	ProxyPassReverse http://127.0.0.1/headphones
-	</Location>	
-
-	<Location /jackett>
-	ProxyPass http://127.0.0.1:9117/jackett
-	ProxyPassReverse http://127.0.0.1/jackett
-	</Location>
-
-	<Location /lazylibrarian>
-	ProxyPass http://127.0.0.1:5299/lazylibrarian
-	ProxyPassReverse http://127.0.0.1/lazylibrarian
-	</Location>
-
-	<Location /madsonic>
-	ProxyPass http://127.0.0.1:4040/madsonic
-	ProxyPassReverse http://127.0.0.1/madsonic
-	</Location>
-
-	#not created yet under install scripts
-	#<Location /mopidy>
-	#ProxyPass http://127.0.0.1:6600/mopidy
-	#ProxyPassReverse http://127.0.0.1/mopidy
-	#</Location>	
-
 	<Location /mylar>
 	ProxyPass http://127.0.0.1:8090/mylar
 	ProxyPassReverse http://127.0.0.1/mylar
 	</Location>
-	
+
 	<Location /nzbget>
 	ProxyPass http://127.0.0.1:6789/nzbget
 	ProxyPassReverse http://127.0.0.1/nzbget
-	</Location>	
-	
+	</Location>
+
 	<Location /ombi>
 	ProxyPass http://127.0.0.1:3579/ombi
 	ProxyPassReverse http://127.0.0.1/ombi
 	</Location>
-	
+
 	<Location /plex>
 	ProxyPass http://127.0.0.1:32400/plex
 	ProxyPassReverse http://127.0.0.1/plex
-	</Location>		
+	</Location>
 
 	<Location /plexpy>
 	ProxyPass http://127.0.0.1:8181/plexpy
 	ProxyPassReverse http://127.0.0.1/plexpy
 	</Location>
-	
+
 	<Location /radarr>
 	ProxyPass http://127.0.0.1:7878/radarr
 	ProxyPassReverse http://127.0.0.1/radarr
-	</Location>		
+	</Location>
 
 	#not created yet under install scripts
 	#<Location /sabnzbd>
 	#ProxyPass http://127.0.0.1:8080/sabnzbd
 	#ProxyPassReverse http://127.0.0.1/sabnzbd
 	#</Location>
-	
+
 	<Location /shinobi>
 	ProxyPass http://127.0.0.1:8080/shinobi
 	ProxyPassReverse http://127.0.0.1/shinobi
-	</Location>		
-	
+	</Location>
+
 	<Location /sickrage>
 	ProxyPass http://127.0.0.1:8081/sickrage
 	ProxyPassReverse http://127.0.0.1/sickrage
 	</Location>
-	
+
 	<Location /sinusbot>
 	ProxyPass http://127.0.0.1:8087/sinusbot
 	ProxyPassReverse http://127.0.0.1/sinusbot
-	</Location>	
-	
+	</Location>
+
 	<Location /sonarr>
 	ProxyPass http://127.0.0.1:8087/sonarr
 	ProxyPassReverse http://127.0.0.1/sonarr
-	</Location>		
-	
+	</Location>
+
 	<Location /ubooquity>
 	ProxyPass http://127.0.0.1:2202/ubooquity
 	ProxyPassReverse http://127.0.0.1/ubooquity
-	</Location>	
-	
+	</Location>
+
 	<Location /webmin>
 	ProxyPass http://127.0.0.1:10000/webmin
 	ProxyPassReverse http://127.0.0.1/webmin
-	</Location>		
-	
+	</Location>
+
 	<Location /webtools>
 	ProxyPass http://127.0.0.1:33400/webtools
 	ProxyPassReverse http://127.0.0.1/webtools
-	</Location>	
-	
+	</Location>
+
 </VirtualHost>
 
+<VirtualHost *:443>
+#empty for now till done
+</VirtualHost>