From 9b564778a9c4b3dc0d9a3549a6152e52382e860d Mon Sep 17 00:00:00 2001
From: Artem Smirnov <urpylka@gmail.com>
Date: Fri, 14 Sep 2018 00:17:20 +0300
Subject: [PATCH] Little fix after merge

Fix license & etc
---
 Dockerfile           | 10 ++++++----
 NOTICE               |  3 ++-
 assets/gpg.conf.sh   | 13 +++++++++----
 assets/nginx.conf.sh |  3 ++-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 40c15f5..449f740 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 # Copyright 2018 Artem B. Smirnov
+# Copyright 2018 Jon Azpiazu
 # Copyright 2016 Bryan J. Hong
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +20,10 @@ LABEL maintainer="urpylka@gmail.com"
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Update APT repository and install packages
+# Update APT repository & install packages
 RUN apt-get -q update \
-  && apt-get -y -q install aptly \
+  && apt-get -y install \
+    aptly \
     bzip2 \
     gnupg \
     gpgv \
@@ -31,8 +33,8 @@ RUN apt-get -q update \
     wget \
     xz-utils \
     apt-utils \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 # Install Aptly Configuration
 COPY assets/aptly.conf /etc/aptly.conf
diff --git a/NOTICE b/NOTICE
index 23425ea..52286d8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,7 +3,8 @@ docker-aptly
 Copyright 2018 Artem B. Smirnov
 
 This product contains software (https://github.com/urpylka/docker-aptly) developed
-by Artem Smirnov (http://github.com/urpylka) licensed under the Apache License.
+by Artem Smirnov (http://github.com/urpylka), and Jon Azpiazu (https://github.com/jonazpiazu)
+licensed under the Apache License.
 
 Copyright 2016 Bryan J. Hong
 
diff --git a/assets/gpg.conf.sh b/assets/gpg.conf.sh
index 934e2b2..570d7e2 100755
--- a/assets/gpg.conf.sh
+++ b/assets/gpg.conf.sh
@@ -1,7 +1,12 @@
-#!/bin/bash
-mkdir -p  ~/.gnupg/
-touch ~/.gnupg/gpg.conf
-cat >> ~/.gnupg/gpg.conf <<EOF
+#! /usr/bin/env bash
+
+# Copyright 2018 Artem B. Smirnov
+# Copyright 2018 Jon Azpiazu
+# Licensed under the Apache License, Version 2.0
+
+mkdir -p  /root/.gnupg/
+touch /root/.gnupg/gpg.conf
+cat >> /root/.gnupg/gpg.conf <<EOF
 personal-digest-preferences SHA256
 cert-digest-algo SHA256
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
diff --git a/assets/nginx.conf.sh b/assets/nginx.conf.sh
index be25bc3..cd1b403 100755
--- a/assets/nginx.conf.sh
+++ b/assets/nginx.conf.sh
@@ -1,5 +1,6 @@
 #! /usr/bin/env bash
 
+# Copyright 2018 Artem B. Smirnov
 # Copyright 2016 Bryan J. Hong
 # Licensed under the Apache License, Version 2.0
 
@@ -7,7 +8,7 @@ cat << EOF > /etc/nginx/conf.d/default.conf
 server_names_hash_bucket_size 64;
 server {
   root /opt/aptly/public;
-  server_name _;
+  server_name ${HOSTNAME};
 
   location / {
     autoindex on;