fix typo

Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxserver/letsencrypt
+FROM lsiobase/alpine.nginx:3.7
 
 # set version label
 ARG BUILD_DATE
@@ -18,15 +18,11 @@ RUN \
 	php7-tokenizer \
 	tar && \
  echo "**** install heimdall ****" && \
- HEIM_VER="$(curl -sX GET https://api.github.com/repos/linuxserver/Heimdall/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \
  mkdir -p \
 	/var/www/localhost/heimdall && \
- curl -o \
- /tmp/heimdall.tar.gz -L \
-	"https://github.com/linuxserver/Heimdall/archive/${HEIM_VER}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
+ git clone \
+	https://github.com/linuxserver/Heimdall.git \
+	/var/www/localhost/heimdall && \
  echo "** cleanup **" && \
  rm -rf \
  /tmp/*

README.md

@@ -67,10 +67,6 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 
 Access the web gui at http://SERVERIP:PORT
 
-## Adding password protection
-
-This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default` and restart the container after updating the image. A new site config with htpasswd support will be created in its place.
-
 ## Info
 
 * To monitor the logs of the container in realtime `docker logs -f heimdall`.
@@ -86,5 +82,4 @@ This image now supports password protection through htpasswd. Run the following
 
 ## Versions
 
-+ **06.03.18:** Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default and restart the container, a new default site config with htpasswd support will be created in its place
 + **12.02.18:** Initial Release.

root/defaults/default

@@ -1,24 +1,15 @@
-## Version 2018/03/08 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/default
-
-# listening on port 80 disabled by default, remove the "#" signs to enable
-# redirect all traffic to https
-#server {
-#	listen 80;
-#	server_name _;
-#	return 301 https://$host$request_uri;
-#}
-
-# main server block
 server {
-	listen 443 ssl default_server;
+	listen 80 default_server;
+
+	listen 443 ssl;
 
 	root /var/www/localhost/heimdall/public;
-	index index.html index.htm index.php;
+	index index.php index.html index.htm;
 
 	server_name _;
 
-	# all ssl related config moved to ssl.conf
-	include /config/nginx/ssl.conf;
+	ssl_certificate /config/keys/cert.crt;
+	ssl_certificate_key /config/keys/cert.key;
 
 	client_max_body_size 0;
 
@@ -28,44 +19,12 @@ server {
 
 	location ~ \.php$ {
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-		# With php7-cgi alone:
+		# With php5-cgi alone:
 		fastcgi_pass 127.0.0.1:9000;
-		# With php7-fpm:
-		#fastcgi_pass unix:/var/run/php7-fpm.sock;
+		# With php5-fpm:
+		#fastcgi_pass unix:/var/run/php5-fpm.sock;
 		fastcgi_index index.php;
 		include /etc/nginx/fastcgi_params;
+
 	}
-
-# sample reverse proxy config for password protected couchpotato running at IP 192.168.1.50 port 5050 with base url "cp"
-# notice this is within the same server block as the base
-# don't forget to generate the .htpasswd file as described on docker hub
-#	location ^~ /cp {
-#		auth_basic "Restricted";
-#		auth_basic_user_file /config/nginx/.htpasswd;
-#		include /config/nginx/proxy.conf;
-#		proxy_pass http://192.168.1.50:5050/cp;
-#	}
-
 }
-
-# sample reverse proxy config without url base, but as a subdomain "cp", ip and port same as above
-# notice this is a new server block, you need a new server block for each subdomain
-#server {
-#	listen 443 ssl;
-#
-#	root /config/www;
-#	index index.html index.htm index.php;
-#
-#	server_name cp.*;
-#
-#	include /config/nginx/ssl.conf;
-#
-#	client_max_body_size 0;
-#
-#	location / {
-#		auth_basic "Restricted";
-#		auth_basic_user_file /config/nginx/.htpasswd;
-#		include /config/nginx/proxy.conf;
-#		proxy_pass http://192.168.1.50:5050;	
-#	}
-#}

root/etc/cont-init.d/50-config

@@ -4,6 +4,12 @@
 mkdir -p \
   /config/www/{backgrounds,icons}
 
+# update from git repo
+cd /var/www/localhost/heimdall
+git pull
+[[ ! -z "$BRANCH" ]] && \
+	git checkout "$BRANCH"
+
 # symlink user config
 
 symlinks=( \