From 138fb154770562b5146c2dd7aa72515a7909ac2a Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Fri, 30 Jun 2017 08:20:44 +0200
Subject: [PATCH] Update branche of addons (#137)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add an optional extended description…
---
 letsencrypt/config.json |  4 +++-
 letsencrypt/run.sh      | 12 ++++++++++--
 mosquitto/config.json   |  2 +-
 nginx_proxy/config.json |  2 +-
 samba/config.json       |  9 +++++++--
 samba/run.sh            |  2 ++
 samba/smb.conf          |  3 ++-
 7 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/letsencrypt/config.json b/letsencrypt/config.json
index 09397bd..a04efd5 100644
--- a/letsencrypt/config.json
+++ b/letsencrypt/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Let's Encrypt",
-  "version": "0.10",
+  "version": "1.0",
   "slug": "letsencrypt",
   "description": "Manage Let's Encrypt certificate",
   "url": "https://home-assistant.io/addons/lets_encrypt/",
@@ -12,12 +12,14 @@
    },
   "map": ["ssl:rw"],
   "options": {
+    "challenge": "https",
     "email": null,
     "domains": [null],
     "certfile": "fullchain.pem",
     "keyfile": "privkey.pem"
   },
   "schema": {
+    "challenge": "str",
     "email": "email",
     "domains": ["str"],
     "certfile": "str",
diff --git a/letsencrypt/run.sh b/letsencrypt/run.sh
index 0567d9e..8329e2d 100644
--- a/letsencrypt/run.sh
+++ b/letsencrypt/run.sh
@@ -5,6 +5,7 @@ CERT_DIR=/data/letsencrypt
 WORK_DIR=/data/workdir
 CONFIG_PATH=/data/options.json
 
+CHALLENGE=$(jq --raw-output ".email" $CONFIG_PATH)
 EMAIL=$(jq --raw-output ".email" $CONFIG_PATH)
 DOMAINS=$(jq --raw-output ".domains[]" $CONFIG_PATH)
 KEYFILE=$(jq --raw-output ".keyfile" $CONFIG_PATH)
@@ -12,6 +13,13 @@ CERTFILE=$(jq --raw-output ".certfile" $CONFIG_PATH)
 
 mkdir -p "$CERT_DIR"
 
+# Select challenge
+if [ "$CHALLENGE" == "http" ]; then
+    CERTBOT_CHALLENGE="http-01"
+else
+    CERTBOT_CHALLENGE="tls-sni-01"
+fi
+
 # Generate new certs
 if [ ! -d "$CERT_DIR/live" ]; then
     DOMAIN_ARR=()
@@ -20,11 +28,11 @@ if [ ! -d "$CERT_DIR/live" ]; then
     done
 
     echo "$DOMAINS" > /data/domains.gen
-    certbot certonly --non-interactive --standalone --email "$EMAIL" --agree-tos --config-dir "$CERT_DIR" --work-dir "$WORK_DIR" "${DOMAIN_ARR[@]}"
+    certbot certonly --non-interactive --standalone --email "$EMAIL" --agree-tos --config-dir "$CERT_DIR" --work-dir "$WORK_DIR" --preferred-challenges "$CERTBOT_CHALLENGE" "${DOMAIN_ARR[@]}"
 
 # Renew certs
 else
-    certbot renew --non-interactive --config-dir "$CERT_DIR" --work-dir "$WORK_DIR"
+    certbot renew --non-interactive --config-dir "$CERT_DIR" --work-dir "$WORK_DIR" --preferred-challenges "$CERTBOT_CHALLENGE"
 fi
 
 # copy certs to store
diff --git a/mosquitto/config.json b/mosquitto/config.json
index d5d6488..f5aeaaf 100644
--- a/mosquitto/config.json
+++ b/mosquitto/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Mosquitto broker",
-  "version": "0.7",
+  "version": "0.8",
   "slug": "mosquitto",
   "description": "An Open Source MQTT broker",
   "url": "https://home-assistant.io/addons/mosquitto/",
diff --git a/nginx_proxy/config.json b/nginx_proxy/config.json
index 9edca6d..609188b 100644
--- a/nginx_proxy/config.json
+++ b/nginx_proxy/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Nginx HomeAssistant SSL proxy",
-  "version": "0.4",
+  "version": "0.5",
   "slug": "nginx_proxy",
   "description": "Use nginx as SSL proxy to HomeAssistant instance",
   "url": "https://home-assistant.io/addons/nginx_proxy/",
diff --git a/samba/config.json b/samba/config.json
index cf386e9..43cadef 100644
--- a/samba/config.json
+++ b/samba/config.json
@@ -1,17 +1,21 @@
 {
   "name": "Samba share",
-  "version": "0.9",
+  "version": "1.0",
   "slug": "samba",
   "description": "Expose HassIO folders with Samba",
   "url": "https://home-assistant.io/addons/samba/",
   "startup": "before",
   "boot": "auto",
   "ports": {
-    "445/tcp": 445
+    "445/tcp": 445,
+    "137/udp": 137,
+    "138/udp": 138,
+    "139/tcp": 139
    },
   "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"],
   "options": {
     "workgroup": "WORKGROUP",
+    "name": "hassio",
     "guest": true,
     "map_config": true,
     "map_addons": true,
@@ -23,6 +27,7 @@
   },
   "schema": {
     "workgroup": "str",
+    "name": "str",
     "guest": "bool",
     "map_config": "bool",
     "map_addons": "bool",
diff --git a/samba/run.sh b/samba/run.sh
index 2e4af71..cf9efc8 100644
--- a/samba/run.sh
+++ b/samba/run.sh
@@ -4,6 +4,7 @@ set -e
 CONFIG_PATH=/data/options.json
 
 WORKGROUP=$(jq --raw-output '.workgroup' $CONFIG_PATH)
+NAME=$(jq --raw-output '.name' $CONFIG_PATH)
 GUEST=$(jq --raw-output '.guest' $CONFIG_PATH)
 USERNAME=$(jq --raw-output '.username // empty' $CONFIG_PATH)
 PASSWORD=$(jq --raw-output '.password // empty' $CONFIG_PATH)
@@ -32,6 +33,7 @@ function write_config() {
 }
 
 sed -i "s/%%WORKGROUP%%/$WORKGROUP/g" /etc/smb.conf
+sed -i "s/%%NAME%%/$NAME/g" /etc/smb.conf
 
 ##
 # Write shares to config
diff --git a/samba/smb.conf b/samba/smb.conf
index 72f6684..019a731 100644
--- a/samba/smb.conf
+++ b/samba/smb.conf
@@ -1,4 +1,5 @@
 [global]
+   netbios name = %%NAME%%
    workgroup = %%WORKGROUP%%
    server string = Samba HomeAssistant config share
    security: user
@@ -9,4 +10,4 @@
    log level = 2
 
    #guest account = root
-   #map to guest = Bad User
+   #map to guest = Bad Password