From 9b93568a3fa9031fb78ffe3320f64ef5af78e0f8 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sun, 29 Mar 2020 22:07:20 -0400
Subject: [PATCH] update auth info in readme, fix version command

---
 Jenkinsfile      |  2 +-
 README.md        | 13 ++-----------
 jenkins-vars.yml |  2 +-
 readme-vars.yml  | 13 ++-----------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 467a28c..8b58f11 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -103,7 +103,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -s http://dl-cdn.alpinelinux.org/alpine/v3.10/main/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}' ''',
+            script: ''' curl -s http://dl-cdn.alpinelinux.org/alpine/v3.11/main/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/README.md b/README.md
index fc3289a..c7cee1c 100644
--- a/README.md
+++ b/README.md
@@ -166,17 +166,7 @@ If you choose to use transmission-web-control as your default UI, just note that
 
 ## Securing the webui with a username/password.
 
-this requires 3 settings to be changed in the settings.json file.
-
-`Make sure the container is stopped before editing these settings.`
-
-`"rpc-authentication-required": true,` - check this, the default is false, change to true.
-
-`"rpc-username": "transmission",` substitute transmission for your chosen user name, this is just an example.
-
-`rpc-password` will be a hash starting with {, replace everything including the { with your chosen password, keeping the quotes.
-
-Transmission will convert it to a hash when you restart the container after making the above edits.
+Use the `USER` and `PASS` variables in docker run/create/compose to set authentication. Do not manually edit the `settings.json` to input user/pass, otherwise transmission cannot be stopped cleanly by the s6 supervisor.
 
 ## Updating Blocklists Automatically
 
@@ -252,6 +242,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.03.20:** - Update auth info in readme.
 * **19.12.19:** - Rebasing to alpine 3.11.
 * **04.10.19:** - Update package label.
 * **21.08.19:** - Add optional user/pass environment variables, fix transmission shut down if user/pass are set.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 59785af..608f353 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-transmission
 external_type: na
-custom_version_command: "curl -s http://dl-cdn.alpinelinux.org/alpine/v3.10/main/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}'"
+custom_version_command: "curl -s http://dl-cdn.alpinelinux.org/alpine/v3.11/main/x86_64/ |awk -F '(transmission-cli-|.apk)' '/transmission-cli.*.apk/ {print $2}'"
 release_type: stable
 release_tag: latest
 ls_branch: master
diff --git a/readme-vars.yml b/readme-vars.yml
index b04e3a6..66c1d70 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -60,17 +60,7 @@ app_setup_block: |
 
   ## Securing the webui with a username/password.
 
-  this requires 3 settings to be changed in the settings.json file.
-
-  `Make sure the container is stopped before editing these settings.`
-
-  `"rpc-authentication-required": true,` - check this, the default is false, change to true.
-
-  `"rpc-username": "transmission",` substitute transmission for your chosen user name, this is just an example.
-
-  `rpc-password` will be a hash starting with {, replace everything including the { with your chosen password, keeping the quotes.
-
-  Transmission will convert it to a hash when you restart the container after making the above edits.
+  Use the `USER` and `PASS` variables in docker run/create/compose to set authentication. Do not manually edit the `settings.json` to input user/pass, otherwise transmission cannot be stopped cleanly by the s6 supervisor.
 
   ## Updating Blocklists Automatically
 
@@ -83,6 +73,7 @@ app_setup_block: |
 # changelog
 changelogs:
 
+  - { date: "29.03.20:", desc: "Update auth info in readme." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
   - { date: "04.10.19:", desc: "Update package label." }
   - { date: "21.08.19:", desc: "Add optional user/pass environment variables, fix transmission shut down if user/pass are set." }