From ae975982a22b28683c2c3ab37d89250922372f40 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 18:01:24 +0200
Subject: [PATCH 01/24] Update 'README.md'

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a2a76bb..4598195 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# Sthope.dev examples and templates
\ No newline at end of file
+# Sthope.dev

From 7af942efb32b62b52efd5714d92db64b4ff2cbf3 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 21:02:46 +0200
Subject: [PATCH 02/24] Add 'docker_portainer_stacks/jekyll/stack.yaml'

---
 docker_portainer_stacks/jekyll/stack.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docker_portainer_stacks/jekyll/stack.yaml

diff --git a/docker_portainer_stacks/jekyll/stack.yaml b/docker_portainer_stacks/jekyll/stack.yaml
new file mode 100644
index 0000000..6a4ef80
--- /dev/null
+++ b/docker_portainer_stacks/jekyll/stack.yaml
@@ -0,0 +1,16 @@
+---
+version: "3.8"
+services:
+  jekyll:
+    image: "jekyll/jekyll:latest"
+    container_name: "jekyll"
+    hostname: "jekyll"
+    command: "jekyll serve --force_polling"
+    network_mode: "bridge"
+    environment:
+      - "TZ=Europe/Amsterdam"
+    volumes:
+      - "/home/sthope/jekyll:/srv/jekyll"
+    ports:
+      - "4000:4000"
+    restart: "unless-stopped"

From a86cd1d06cb1f240b765557fd97a21f7336c7a4b Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 21:03:47 +0200
Subject: [PATCH 03/24] Update
 'docker_portainer_stacks/portainer/install-portainer-agent'

---
 docker_portainer_stacks/portainer/install-portainer-agent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker_portainer_stacks/portainer/install-portainer-agent b/docker_portainer_stacks/portainer/install-portainer-agent
index 051d1e5..d6758b9 100644
--- a/docker_portainer_stacks/portainer/install-portainer-agent
+++ b/docker_portainer_stacks/portainer/install-portainer-agent
@@ -4,7 +4,7 @@
 ###################################
 
 #### USAGE
-# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/docker_portainer_stacks/raw/branch/master/portainer/install-portainer-agent)" EDGE_ID EDGE_KEY
+# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/install-portainer-agent)" EDGE_ID EDGE_KEY
 # 
 
 sudo docker run -d \

From dd05b79b644e7b8dcfd0e1265e98b472e804d990 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 21:09:29 +0200
Subject: [PATCH 04/24] Add
 'docker_portainer_stacks/portainer/setup-dockerapi-notls'

---
 .../portainer/setup-dockerapi-notls           | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 docker_portainer_stacks/portainer/setup-dockerapi-notls

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-notls b/docker_portainer_stacks/portainer/setup-dockerapi-notls
new file mode 100644
index 0000000..79aa393
--- /dev/null
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-notls
@@ -0,0 +1,23 @@
+#!/bin/bash
+###################################
+############ by Sthope ############
+###################################
+
+#### USAGE
+# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
+# 
+
+mkdir -p /etc/systemd/system/docker.service.d/
+
+cat << EOF > /etc/systemd/system/docker.service.d/startup_options.conf
+# /etc/systemd/system/docker.service.d/override.conf
+[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:2376
+EOF
+
+systemctl daemon-reload
+
+systemctl restart docker.service
+
+echo "You can now connect Portainer to this host."
\ No newline at end of file

From f8c677aded48af80a95a5fae1bf5f1c5d3f3f48f Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 21:13:20 +0200
Subject: [PATCH 05/24] Update 'docker_portainer_stacks/portainer/README.md'

---
 docker_portainer_stacks/portainer/README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker_portainer_stacks/portainer/README.md b/docker_portainer_stacks/portainer/README.md
index ed8865b..e4ea9da 100644
--- a/docker_portainer_stacks/portainer/README.md
+++ b/docker_portainer_stacks/portainer/README.md
@@ -1,8 +1,6 @@
 # Portainer
 
 Docker-compose stack with Portainer, VSCode, WatchTower
-
-
 Install with 1 line cmd (running as sudo/root)
 ```
 clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/docker_portainer_stacks/raw/branch/master/portainer/script/install_nosudo)"
@@ -18,4 +16,9 @@ wget https://git.sthope.dev/sthope/docker_portainer_stacks/raw/branch/master/por
 ```
 bash -c "$(wget -qLO - https://git.sthope.dev/sthope/docker_portainer_stacks/raw/branch/master/portainer/install-portainer-agent)" EDGE_ID EDGE_KEY
 ```
-Replace `EDGE_ID` and `EDGE_KEY` with ones given by Portainer
\ No newline at end of file
+Replace `EDGE_ID` and `EDGE_KEY` with ones given by Portainer
+
+# Portainer EndPoint DockerAPI no TLS
+```
+clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
+```
\ No newline at end of file

From 79de6df9f49db4cd4cb0e6c54c97fe577ba2e21a Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 21:36:04 +0200
Subject: [PATCH 06/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-notls'

---
 .../portainer/setup-dockerapi-notls           | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-notls b/docker_portainer_stacks/portainer/setup-dockerapi-notls
index 79aa393..1a5c8c2 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-notls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-notls
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 ###################################
 ############ by Sthope ############
@@ -7,17 +8,30 @@
 # bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
 # 
 
+findRandomTcpPort(){
+	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
+	while :
+	do
+		(echo >/dev/tcp/localhost/$port) &>/dev/null &&  port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) )) || break
+	done
+	echo "$port"
+}
+
+
 mkdir -p /etc/systemd/system/docker.service.d/
 
+p=$(findRandomTcpPort)
+
 cat << EOF > /etc/systemd/system/docker.service.d/startup_options.conf
 # /etc/systemd/system/docker.service.d/override.conf
 [Service]
 ExecStart=
-ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:2376
+ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:$p
 EOF
 
-systemctl daemon-reload
+# systemctl daemon-reload
 
-systemctl restart docker.service
+# systemctl restart docker.service
+
+echo "You can now connect Portainer to this host at port: $p"
 
-echo "You can now connect Portainer to this host."
\ No newline at end of file

From 21a6e9a93d28a6edf988a0fef0ff74ae32593592 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 21:38:54 +0200
Subject: [PATCH 07/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-notls'

---
 .../portainer/setup-dockerapi-notls                  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-notls b/docker_portainer_stacks/portainer/setup-dockerapi-notls
index 1a5c8c2..ab7ad54 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-notls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-notls
@@ -8,6 +8,8 @@
 # bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
 # 
 
+
+
 findRandomTcpPort(){
 	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
 	while :
@@ -29,9 +31,13 @@ ExecStart=
 ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:$p
 EOF
 
-# systemctl daemon-reload
+systemctl daemon-reload
 
-# systemctl restart docker.service
+systemctl restart docker.service
 
+clear
+
+echo "######################################################################"
+echo "############################# by Sthope ##############################"
+echo "######################################################################"
 echo "You can now connect Portainer to this host at port: $p"
-

From 4b1135c928224edadf8360d52ba528558f28487c Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 21:39:38 +0200
Subject: [PATCH 08/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-notls'

---
 .../portainer/setup-dockerapi-notls                   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-notls b/docker_portainer_stacks/portainer/setup-dockerapi-notls
index ab7ad54..9530a89 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-notls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-notls
@@ -6,9 +6,7 @@
 
 #### USAGE
 # bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
-# 
-
-
+#
 
 findRandomTcpPort(){
 	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
@@ -19,7 +17,6 @@ findRandomTcpPort(){
 	echo "$port"
 }
 
-
 mkdir -p /etc/systemd/system/docker.service.d/
 
 p=$(findRandomTcpPort)
@@ -31,11 +28,7 @@ ExecStart=
 ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:$p
 EOF
 
-systemctl daemon-reload
-
-systemctl restart docker.service
-
-clear
+systemctl daemon-reload;systemctl restart docker.service;clear
 
 echo "######################################################################"
 echo "############################# by Sthope ##############################"

From 7a3ed23387c37afdcf7526dac98580d522540ff0 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:10:30 +0200
Subject: [PATCH 09/24] Add
 'docker_portainer_stacks/portainer/setup-dockerapi-withtls'

---
 .../portainer/setup-dockerapi-withtls         | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 docker_portainer_stacks/portainer/setup-dockerapi-withtls

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
new file mode 100644
index 0000000..1b608b2
--- /dev/null
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
@@ -0,0 +1,40 @@
+
+#!/bin/bash
+###################################
+############ by Sthope ############
+###################################
+
+#### USAGE
+# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-withtls)"
+#
+
+findRandomTcpPort(){
+	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
+	while :
+	do
+		(echo >/dev/tcp/localhost/$port) &>/dev/null &&  port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) )) || break
+	done
+	echo "$port"
+}
+p=$(findRandomTcpPort)
+
+# MY_HOSTNAME=$(getent hosts $(hostname) | awk '{print $2}')
+# MY_HOSTNAME=$(getent hosts $(hostname) | awk '{print $1}')
+MY_IP=$(ip -4 route get 8.8.8.8 | awk {'print $7'} | tr -d '\n')
+
+function openssl_genrsa_pass {
+    LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 64 > remember2delete
+}
+
+$(openssl_genrsa_pass);cat remember2delete
+
+openssl genrsa -aes256  -passout file:remember2delete -out ca-key.pem 4096
+
+openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -out ca.pem -passin file:remember2delete \
+ -subj "/C=US/CN=${MY_IP}"
+
+clear
+echo "##########################################################"
+echo "############################# by Sthope ##################"
+echo "##########################################################"
+echo "Save this password and delete the file: ";cat remember2delete; echo "                  "
\ No newline at end of file

From d5f1e63acc9b2a751d18bf1880f39a3f7cd04695 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:18:57 +0200
Subject: [PATCH 10/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-withtls'

---
 docker_portainer_stacks/portainer/setup-dockerapi-withtls | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
index 1b608b2..a19f5bf 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
@@ -1,11 +1,10 @@
-
 #!/bin/bash
 ###################################
 ############ by Sthope ############
 ###################################
 
 #### USAGE
-# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-withtls)"
+# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
 #
 
 findRandomTcpPort(){
@@ -37,4 +36,5 @@ clear
 echo "##########################################################"
 echo "############################# by Sthope ##################"
 echo "##########################################################"
-echo "Save this password and delete the file: ";cat remember2delete; echo "                  "
\ No newline at end of file
+echo "Save this password and delete the file: ";cat remember2delete; echo "                  "
+rm ./.bash_history

From 50868425f5bd9346959cf49317ff4468221a6b07 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:27:27 +0200
Subject: [PATCH 11/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-withtls'

---
 .../portainer/setup-dockerapi-withtls                  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
index a19f5bf..24e59b1 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
@@ -30,7 +30,15 @@ $(openssl_genrsa_pass);cat remember2delete
 openssl genrsa -aes256  -passout file:remember2delete -out ca-key.pem 4096
 
 openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -out ca.pem -passin file:remember2delete \
- -subj "/C=US/CN=${MY_IP}"
+ -subj "/C=US/CN=$MY_IP"
+
+openssl genrsa -out server-key.pem 4096
+
+echo subjectAltName = DNS:$MY_IP,IP:10.0.0.200,IP:127.0.0.1 >> extfile.cnf
+echo extendedKeyUsage = serverAuth >> extfile.cnf
+
+openssl x509 -req -days 365 -sha256 -in server.csr -CA ca.pem -CAkey ca-key.pem \
+  -CAcreateserial -out server-cert.pem -extfile extfile.cnf
 
 clear
 echo "##########################################################"

From 47b0dda94b2395433b3a54eee330cc640d98fcb6 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:27:57 +0200
Subject: [PATCH 12/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-withtls'

---
 docker_portainer_stacks/portainer/setup-dockerapi-withtls | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
index 24e59b1..9fe5c1c 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-withtls
@@ -42,7 +42,8 @@ openssl x509 -req -days 365 -sha256 -in server.csr -CA ca.pem -CAkey ca-key.pem
 
 clear
 echo "##########################################################"
+echo "Save this password and delete the file: ";cat remember2delete; echo "                  "
+echo "##########################################################"
 echo "############################# by Sthope ##################"
 echo "##########################################################"
-echo "Save this password and delete the file: ";cat remember2delete; echo "                  "
 rm ./.bash_history

From 1be2b824da830b9ffc08156171ac3b05303da9a9 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:37:55 +0200
Subject: [PATCH 13/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-master-withtls'

---
 .../{setup-dockerapi-withtls => setup-dockerapi-master-withtls}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docker_portainer_stacks/portainer/{setup-dockerapi-withtls => setup-dockerapi-master-withtls} (100%)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls
similarity index 100%
rename from docker_portainer_stacks/portainer/setup-dockerapi-withtls
rename to docker_portainer_stacks/portainer/setup-dockerapi-master-withtls

From f34fc088f28119ad990b95e6ceb04c6201a64ef2 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:38:26 +0200
Subject: [PATCH 14/24] Add
 'docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls'

---
 .../portainer/setup-dockerapi-slave-withtls   | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
new file mode 100644
index 0000000..7dd4f12
--- /dev/null
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
@@ -0,0 +1,56 @@
+#!/bin/bash
+###################################
+############ by Sthope ############
+###################################
+
+#### USAGE
+# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls)"
+#
+
+openssl genrsa -out key.pem 4096
+
+MY_IP=$(ip -4 route get 8.8.8.8 | awk {'print $7'} | tr -d '\n')
+
+openssl req -subj "/CN=$MY_IP" -new -key key.pem -out client.csr
+
+echo extendedKeyUsage = clientAuth > extfile-client.cnf
+
+openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.pem -CAkey ca-key.pem \
+  -CAcreateserial -out cert.pem -extfile extfile-client.cnf
+
+chmod -v 0400 ca-key.pem key.pem server-key.pem
+chmod -v 0444 ca.pem server-cert.pem cert.pem
+
+mkdir ~/.certs
+cp ca.pem ~/.certs
+cp server-cert.pem ~/.certs
+cp server-key.pem ~/.certs
+
+p(){
+	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
+	while :
+	do
+		(echo >/dev/tcp/localhost/$port) &>/dev/null &&  port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) )) || break
+	done
+	echo "$port"
+}
+
+mkdir -p /etc/systemd/system/docker.service.d/
+
+cat << EOF > /etc/systemd/system/docker.service.d/startup_options.conf
+# /etc/systemd/system/docker.service.d/override.conf
+[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd --tlsverify --tlscacert=/home/pi/.certs/ca.pem --tlscert=/home/pi/.certs/server-cert.pem --tlskey=/home/pi/.certs/server-key.pem -H fd:// -H tcp://0.0.0.0:$(p)
+EOF
+
+systemctl daemon-reload
+systemctl restart docker.service
+clear
+
+
+echo "######################################################################"
+echo "############################# by Sthope ##############################"
+echo "######################################################################"
+echo "You can now connect Portainer to this host at port: $(p)"
+cat /etc/systemd/system/docker.service.d/startup_options.conf
\ No newline at end of file

From 28f4a32a670a1922159612356a0357f18c28c1d7 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:38:46 +0200
Subject: [PATCH 15/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-master-withtls'

---
 .../portainer/setup-dockerapi-master-withtls                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls
index 9fe5c1c..4b3b87f 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls
@@ -4,7 +4,7 @@
 ###################################
 
 #### USAGE
-# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
+# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls)"
 #
 
 findRandomTcpPort(){

From 5195f8be23046f6a03ef6d5350bc74dfba47f68c Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:41:57 +0200
Subject: [PATCH 16/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls'

---
 .../portainer/setup-dockerapi-slave-withtls                    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
index 7dd4f12..fd8c7b0 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
@@ -4,7 +4,7 @@
 ###################################
 
 #### USAGE
-# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls)"
+# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
 #
 
 openssl genrsa -out key.pem 4096
@@ -48,7 +48,6 @@ systemctl daemon-reload
 systemctl restart docker.service
 clear
 
-
 echo "######################################################################"
 echo "############################# by Sthope ##############################"
 echo "######################################################################"

From 782745e52f900d49b7fc3a33331dfbf3e4012fd8 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:42:56 +0200
Subject: [PATCH 17/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls'

---
 docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
index fd8c7b0..dec73e5 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
@@ -51,5 +51,5 @@ clear
 echo "######################################################################"
 echo "############################# by Sthope ##############################"
 echo "######################################################################"
-echo "You can now connect Portainer to this host at port: $(p)"
+echo "You can now connect Portainer to this host at ip: $MY_IP and port:"
 cat /etc/systemd/system/docker.service.d/startup_options.conf
\ No newline at end of file

From 1cc0328f3c476455ee153829a25caa4caa81f043 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:46:43 +0200
Subject: [PATCH 18/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls'

---
 .../portainer/setup-dockerapi-slave-withtls                    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
index dec73e5..b1f0361 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
@@ -4,7 +4,7 @@
 ###################################
 
 #### USAGE
-# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
+# clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
 #
 
 openssl genrsa -out key.pem 4096
@@ -46,7 +46,6 @@ EOF
 
 systemctl daemon-reload
 systemctl restart docker.service
-clear
 
 echo "######################################################################"
 echo "############################# by Sthope ##############################"

From 2b0948ffcebe362a8f68aa72c6442b09e3790ad2 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Thu, 2 Sep 2021 23:56:43 +0200
Subject: [PATCH 19/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls'

---
 .../portainer/setup-dockerapi-slave-withtls      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
index b1f0361..764037d 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
@@ -4,7 +4,7 @@
 ###################################
 
 #### USAGE
-# clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
+# clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls)"
 #
 
 openssl genrsa -out key.pem 4096
@@ -18,13 +18,13 @@ echo extendedKeyUsage = clientAuth > extfile-client.cnf
 openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.pem -CAkey ca-key.pem \
   -CAcreateserial -out cert.pem -extfile extfile-client.cnf
 
-chmod -v 0400 ca-key.pem key.pem server-key.pem
-chmod -v 0444 ca.pem server-cert.pem cert.pem
+# chmod -v 0400 ca-key.pem key.pem server-key.pem
+# chmod -v 0444 ca.pem server-cert.pem cert.pem
 
-mkdir ~/.certs
-cp ca.pem ~/.certs
-cp server-cert.pem ~/.certs
-cp server-key.pem ~/.certs
+mkdir -p /certs/
+cp ca.pem /certs/
+cp server-cert.pem /certs/
+cp server-key.pem /certs/
 
 p(){
 	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
@@ -41,7 +41,7 @@ cat << EOF > /etc/systemd/system/docker.service.d/startup_options.conf
 # /etc/systemd/system/docker.service.d/override.conf
 [Service]
 ExecStart=
-ExecStart=/usr/bin/dockerd --tlsverify --tlscacert=/home/pi/.certs/ca.pem --tlscert=/home/pi/.certs/server-cert.pem --tlskey=/home/pi/.certs/server-key.pem -H fd:// -H tcp://0.0.0.0:$(p)
+ExecStart=/usr/bin/dockerd --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H fd:// -H tcp://0.0.0.0:$(p)
 EOF
 
 systemctl daemon-reload

From 32cb326ad7eb87ea7fc704c1b591dffed40d492b Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Fri, 3 Sep 2021 02:17:00 +0200
Subject: [PATCH 20/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-master-withtls.sh'

---
 ...htls => setup-dockerapi-master-withtls.sh} | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)
 rename docker_portainer_stacks/portainer/{setup-dockerapi-master-withtls => setup-dockerapi-master-withtls.sh} (52%)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls.sh
similarity index 52%
rename from docker_portainer_stacks/portainer/setup-dockerapi-master-withtls
rename to docker_portainer_stacks/portainer/setup-dockerapi-master-withtls.sh
index 4b3b87f..9c7d285 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls.sh
@@ -4,8 +4,9 @@
 ###################################
 
 #### USAGE
-# bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls)"
+# clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls)"
 #
+mkdir -p /opt/certs
 
 findRandomTcpPort(){
 	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
@@ -22,23 +23,23 @@ p=$(findRandomTcpPort)
 MY_IP=$(ip -4 route get 8.8.8.8 | awk {'print $7'} | tr -d '\n')
 
 function openssl_genrsa_pass {
-    LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 64 > remember2delete
+    LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 64 > /opt/certs/remember2delete
 }
 
-$(openssl_genrsa_pass);cat remember2delete
+$(openssl_genrsa_pass);cat /opt/certs/remember2delete
 
-openssl genrsa -aes256  -passout file:remember2delete -out ca-key.pem 4096
+openssl genrsa -aes256  -passout file:/opt/certs/remember2delete -out /opt/certs/ca-key.pem 4096
 
-openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -out ca.pem -passin file:remember2delete \
+openssl req -new -x509 -days 365 -key /opt/certs/ca-key.pem -sha256 -out /opt/certs/ca.pem -passin file:/opt/certs/remember2delete \
  -subj "/C=US/CN=$MY_IP"
 
-openssl genrsa -out server-key.pem 4096
+openssl genrsa -out /opt/certs/server-key.pem 4096
 
-echo subjectAltName = DNS:$MY_IP,IP:10.0.0.200,IP:127.0.0.1 >> extfile.cnf
-echo extendedKeyUsage = serverAuth >> extfile.cnf
+echo subjectAltName = DNS:$MY_IP,IP:10.0.0.200,IP:127.0.0.1 >> /opt/certs/extfile.cnf
+echo extendedKeyUsage = serverAuth >> /opt/certs/extfile.cnf
 
-openssl x509 -req -days 365 -sha256 -in server.csr -CA ca.pem -CAkey ca-key.pem \
-  -CAcreateserial -out server-cert.pem -extfile extfile.cnf
+openssl x509 -req -days 365 -sha256 -in /opt/certs/server.csr -CA /opt/certs/ca.pem -CAkey /opt/certs/ca-key.pem \
+  -CAcreateserial -out /opt/certs/server-cert.pem -extfile /opt/certs/extfile.cnf
 
 clear
 echo "##########################################################"

From 62c101515c2cb57a4bcf40857b15477504db616a Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Fri, 3 Sep 2021 02:19:15 +0200
Subject: [PATCH 21/24] Update
 'docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls.sh'

---
 ...thtls => setup-dockerapi-slave-withtls.sh} | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 rename docker_portainer_stacks/portainer/{setup-dockerapi-slave-withtls => setup-dockerapi-slave-withtls.sh} (66%)

diff --git a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls.sh
similarity index 66%
rename from docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
rename to docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls.sh
index 764037d..59a1613 100644
--- a/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls
+++ b/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls.sh
@@ -6,25 +6,25 @@
 #### USAGE
 # clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls)"
 #
+mkdir -p /opt/certs
 
-openssl genrsa -out key.pem 4096
+openssl genrsa -out /opt/certs/key.pem 4096
 
 MY_IP=$(ip -4 route get 8.8.8.8 | awk {'print $7'} | tr -d '\n')
 
-openssl req -subj "/CN=$MY_IP" -new -key key.pem -out client.csr
+openssl req -subj "/CN=$MY_IP" -new -key /opt/certs/key.pem -out /opt/certs/client.csr
 
-echo extendedKeyUsage = clientAuth > extfile-client.cnf
+echo extendedKeyUsage = clientAuth > /opt/certs/extfile-client.cnf
 
-openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.pem -CAkey ca-key.pem \
-  -CAcreateserial -out cert.pem -extfile extfile-client.cnf
+openssl x509 -req -days 365 -sha256 -in /opt/certs/client.csr -CA /opt/certs/ca.pem -CAkey /opt/certs/ca-key.pem \
+  -CAcreateserial -out /opt/certs/cert.pem -extfile /opt/certs/extfile-client.cnf
 
 # chmod -v 0400 ca-key.pem key.pem server-key.pem
 # chmod -v 0444 ca.pem server-cert.pem cert.pem
 
-mkdir -p /certs/
-cp ca.pem /certs/
-cp server-cert.pem /certs/
-cp server-key.pem /certs/
+# cp ca.pem /certs/
+# cp server-cert.pem /certs/
+# cp server-key.pem /certs/
 
 p(){
 	port=$(( 100+( $(od -An -N2 -i /dev/random) )%(1023+1) ))
@@ -41,7 +41,7 @@ cat << EOF > /etc/systemd/system/docker.service.d/startup_options.conf
 # /etc/systemd/system/docker.service.d/override.conf
 [Service]
 ExecStart=
-ExecStart=/usr/bin/dockerd --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H fd:// -H tcp://0.0.0.0:$(p)
+ExecStart=/usr/bin/dockerd --tlsverify --tlscacert=/opt/certs/ca.pem --tlscert=/opt/certs/server-cert.pem --tlskey=/opt/certs/server-key.pem -H fd:// -H tcp://0.0.0.0:$(p)
 EOF
 
 systemctl daemon-reload

From 149662fb7d7e538567a4578d107e8e38062fa079 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Fri, 3 Sep 2021 02:20:12 +0200
Subject: [PATCH 22/24] Update 'docker_portainer_stacks/portainer/README.md'

---
 docker_portainer_stacks/portainer/README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker_portainer_stacks/portainer/README.md b/docker_portainer_stacks/portainer/README.md
index e4ea9da..36ddff2 100644
--- a/docker_portainer_stacks/portainer/README.md
+++ b/docker_portainer_stacks/portainer/README.md
@@ -18,7 +18,15 @@ bash -c "$(wget -qLO - https://git.sthope.dev/sthope/docker_portainer_stacks/raw
 ```
 Replace `EDGE_ID` and `EDGE_KEY` with ones given by Portainer
 
-# Portainer EndPoint DockerAPI no TLS
+# Portainer EndPoint DockerAPI
+no TLS
 ```
 clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-notls)"
-```
\ No newline at end of file
+```
+TLS Master
+```
+clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls)"
+```
+TLS Slave
+```
+clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls)"
\ No newline at end of file

From a9e15a7adb4ff1471d250bd1fc9b07c5a49541be Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Fri, 3 Sep 2021 02:21:49 +0200
Subject: [PATCH 23/24] Update 'docker_portainer_stacks/portainer/README.md'

---
 docker_portainer_stacks/portainer/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker_portainer_stacks/portainer/README.md b/docker_portainer_stacks/portainer/README.md
index 36ddff2..0f3cd30 100644
--- a/docker_portainer_stacks/portainer/README.md
+++ b/docker_portainer_stacks/portainer/README.md
@@ -25,8 +25,8 @@ clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/b
 ```
 TLS Master
 ```
-clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls)"
+clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-master-withtls.sh)"
 ```
 TLS Slave
 ```
-clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls)"
\ No newline at end of file
+clear;bash -c "$(wget -qLO - https://git.sthope.dev/sthope/sthope-examples/raw/branch/master/docker_portainer_stacks/portainer/setup-dockerapi-slave-withtls.sh)"
\ No newline at end of file

From ec2f9d52c1c5cdfbb0c70f0e6d62b0bd872e37e7 Mon Sep 17 00:00:00 2001
From: sthope <sthope@git.sthope>
Date: Fri, 3 Sep 2021 21:32:39 +0200
Subject: [PATCH 24/24] Add 'custom-cmds-in-ubuntu/bin_examples/sshkeys.sh'

---
 custom-cmds-in-ubuntu/bin_examples/sshkeys.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 custom-cmds-in-ubuntu/bin_examples/sshkeys.sh

diff --git a/custom-cmds-in-ubuntu/bin_examples/sshkeys.sh b/custom-cmds-in-ubuntu/bin_examples/sshkeys.sh
new file mode 100644
index 0000000..eeb3eed
--- /dev/null
+++ b/custom-cmds-in-ubuntu/bin_examples/sshkeys.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+## NOT FINISHED!!!
+
+function openssl_genrsa_pass {
+
+    LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 64 > /opt/certs/remember2delete
+}
+
+$(openssl_genrsa_pass)
+
+
+mkdir -p /opt/.certs/;cd /opt/.certs/