Compare commits

..

3 Commits
39 ... dev

Author SHA1 Message Date
aptalca
8a231a0083 fix typo 2018-02-23 16:48:11 -05:00
aptalca
b4e6b7a6cf Add BRANCH variable 2018-02-23 15:52:39 -05:00
aptalca
b767cf054f Pull from git master 2018-02-23 15:45:03 -05:00
4 changed files with 12 additions and 28 deletions

View File

@@ -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/*

View File

@@ -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.

View File

@@ -1,5 +1,3 @@
## Version 2018/03/06 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/default
server {
listen 80 default_server;
@@ -14,21 +12,10 @@ server {
ssl_certificate_key /config/keys/cert.key;
client_max_body_size 0;
error_page 599 = @noauth;
location / {
if (!-f /config/nginx/.htpasswd) {
return 599;
}
auth_basic "Restricted";
auth_basic_user_file /config/nginx/.htpasswd;
try_files $uri $uri/ /index.php?$args;
}
location @noauth {
try_files $uri $uri/ /index.php?$args;
}
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;

View File

@@ -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=( \