From 08de05f93e9aa046d66a118e7550200329745c94 Mon Sep 17 00:00:00 2001 From: Robert Middleswarth <72569+rmiddle@users.noreply.github.com> Date: Mon, 1 Nov 2021 12:17:37 -0400 Subject: [PATCH 1/4] Change the default to 1000 for all PGID this wont effect exisitng installs only new services. (#107) --- pi-hosted_template/template/portainer-v2.json | 155 +++++++++--------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/pi-hosted_template/template/portainer-v2.json b/pi-hosted_template/template/portainer-v2.json index a6a9b6d..c11407b 100644 --- a/pi-hosted_template/template/portainer-v2.json +++ b/pi-hosted_template/template/portainer-v2.json @@ -140,7 +140,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -186,7 +186,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -229,7 +229,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -300,7 +300,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -344,7 +344,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -479,7 +479,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -519,7 +519,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -566,7 +566,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -602,7 +602,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -667,7 +667,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -913,7 +913,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -955,7 +955,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -990,7 +990,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1081,7 +1081,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -1139,7 +1139,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1180,7 +1180,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1215,7 +1215,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1261,7 +1261,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -1309,7 +1309,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1345,7 +1345,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1436,7 +1436,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1476,7 +1476,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1517,7 +1517,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1556,7 +1556,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1593,7 +1593,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1627,7 +1627,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1662,7 +1662,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1728,7 +1728,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -1773,7 +1773,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -1855,7 +1855,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1893,7 +1893,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -1979,7 +1979,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2014,7 +2014,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2053,7 +2053,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2095,7 +2095,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2158,7 +2158,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2224,11 +2224,12 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, { + "default": "000", "label": "UMASK", "name": "UMASK", "set": "000" @@ -2269,7 +2270,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2316,7 +2317,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2345,7 +2346,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2390,7 +2391,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -2461,7 +2462,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2497,7 +2498,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2541,7 +2542,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -2605,7 +2606,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2640,7 +2641,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2746,7 +2747,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2782,7 +2783,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -2830,7 +2831,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -2872,7 +2873,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -2914,7 +2915,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3020,7 +3021,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3058,7 +3059,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3098,7 +3099,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3133,7 +3134,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3201,7 +3202,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3243,7 +3244,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3283,7 +3284,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3350,7 +3351,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3393,7 +3394,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3435,7 +3436,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3474,7 +3475,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3523,7 +3524,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3563,7 +3564,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3601,7 +3602,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3658,7 +3659,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3702,7 +3703,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -3769,7 +3770,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3804,7 +3805,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3848,7 +3849,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3889,7 +3890,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -3952,7 +3953,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -4076,7 +4077,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, @@ -4159,7 +4160,7 @@ "name": "PUID" }, { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" } @@ -4190,12 +4191,12 @@ "description": "This container contains OpenVPN and Deluge with a configuration where Deluge is running only when OpenVPN has an active tunnel. It bundles configuration files for many popular VPN providers to make the setup easier.", "env": [ { - "default": "1001", + "default": "1000", "label": "PUID", "name": "PUID" }, { - "default": "1001", + "default": "1000", "label": "PGID", "name": "PUID" }, @@ -4518,7 +4519,7 @@ "description": "Homebridge allows you to integrate with smart home devices that do not natively support HomeKit. There are over 2,000 Homebridge plugins supporting thousands of different smart accessories.", "env": [ { - "default": "100", + "default": "1000", "label": "PGID", "name": "PGID" }, From e971032faedcf07f5a038ce3451afc496b2ccd16 Mon Sep 17 00:00:00 2001 From: Robert Middleswarth <72569+rmiddle@users.noreply.github.com> Date: Mon, 1 Nov 2021 20:18:39 -0400 Subject: [PATCH 2/4] Add an install portioner agent script --- install_portainer_agent.sh | 20 ++++++++++++++++++++ update_libseccomp2.sh | 0 2 files changed, 20 insertions(+) create mode 100755 install_portainer_agent.sh mode change 100644 => 100755 update_libseccomp2.sh diff --git a/install_portainer_agent.sh b/install_portainer_agent.sh new file mode 100755 index 0000000..8eed5a3 --- /dev/null +++ b/install_portainer_agent.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +function error { + echo -e "\\e[91m$1\\e[39m" + exit 1 +} + +function check_internet() { + printf "Checking if you are online..." + wget -q --spider http://github.com + if [ $? -eq 0 ]; then + echo "Online. Continuing." + else + error "Offline. Go connect to the internet then run the script again." + fi +} + +check_internet + +sudo docker run -d -p 9001:9001 --name portainer_agent --restart=always -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/volumes:/var/lib/docker/volumes portainer/agent:latest || error "Failed to execute newer version of Portainer Agent!" diff --git a/update_libseccomp2.sh b/update_libseccomp2.sh old mode 100644 new mode 100755 From 0940f1e7fcbe51d3d17adc56b33bd814911af0ba Mon Sep 17 00:00:00 2001 From: Robert Middleswarth <72569+rmiddle@users.noreply.github.com> Date: Mon, 1 Nov 2021 22:14:04 -0400 Subject: [PATCH 3/4] Migrate all the tools to a sub folder called tools. (#110) * Migrate all the scripts to the tools folder --- docs/nginx_proxy_manager.md | 4 ++-- docs/rpi_docker_monitor.md | 7 +++---- .../install_portainer_agent.sh | 0 nginx-proxy-manager.sh => tools/nginx-proxy-manager.sh | 0 rpi_docker_monitor.sh => tools/rpi_docker_monitor.sh | 0 traefik.sh => tools/traefik.sh | 0 update_libseccomp2.sh => tools/update_libseccomp2.sh | 0 .../update_portainer_agent.sh | 0 8 files changed, 5 insertions(+), 6 deletions(-) rename install_portainer_agent.sh => tools/install_portainer_agent.sh (100%) rename nginx-proxy-manager.sh => tools/nginx-proxy-manager.sh (100%) rename rpi_docker_monitor.sh => tools/rpi_docker_monitor.sh (100%) rename traefik.sh => tools/traefik.sh (100%) rename update_libseccomp2.sh => tools/update_libseccomp2.sh (100%) rename update_portainer_agent.sh => tools/update_portainer_agent.sh (100%) diff --git a/docs/nginx_proxy_manager.md b/docs/nginx_proxy_manager.md index 78158f8..a9f9a3c 100644 --- a/docs/nginx_proxy_manager.md +++ b/docs/nginx_proxy_manager.md @@ -18,13 +18,13 @@ First thing we need to do is setup the folder structure and install some files t Run the following script ``` -sudo ./nginx-proxy-manager.sh +sudo ./tools/nginx-proxy-manager.sh ``` Your output should look something like this ``` -# sudo ./nginx-proxy-manager.sh +# sudo ./tools/nginx-proxy-manager.sh Creating directories... Creating a blank nginx-proxy-manager config files Setup complete. You can now install the stack using the App Template. diff --git a/docs/rpi_docker_monitor.md b/docs/rpi_docker_monitor.md index 9871b99..7af6d7f 100755 --- a/docs/rpi_docker_monitor.md +++ b/docs/rpi_docker_monitor.md @@ -69,13 +69,13 @@ First thing we need to do is setup the folder structure and install some files t Run the following script ``` -sudo ./rpi_docker_monitor.sh +sudo ./tools/rpi_docker_monitor.sh ``` Your output should look something like this ``` -# sudo ./rpi_docker_monitor.sh +# sudo ./tools/rpi_docker_monitor.sh creating directories downloading prometheus config files --2021-10-17 00:56:28-- https://raw.githubusercontent.com/oijkn/Docker-Raspberry-PI-Monitoring/main/prometheus/prometheus.yml @@ -97,8 +97,7 @@ Done You are ready to goto next step in the install document

## Install the App Template.
-[comment]: # (FixMe) -![alt text](https://raw.githubusercontent.com/novaspirit/pi-hosted/master/docs/images/rpi_docker_monitor-AppTemplatesList.png) +![App Templates Lists](https://raw.githubusercontent.com/novaspirit/pi-hosted/master/docs/images/rpi_docker_monitor-AppTemplatesList.png) Goto App Templates and install "Raspberry Pi Docker Monitor" diff --git a/install_portainer_agent.sh b/tools/install_portainer_agent.sh similarity index 100% rename from install_portainer_agent.sh rename to tools/install_portainer_agent.sh diff --git a/nginx-proxy-manager.sh b/tools/nginx-proxy-manager.sh similarity index 100% rename from nginx-proxy-manager.sh rename to tools/nginx-proxy-manager.sh diff --git a/rpi_docker_monitor.sh b/tools/rpi_docker_monitor.sh similarity index 100% rename from rpi_docker_monitor.sh rename to tools/rpi_docker_monitor.sh diff --git a/traefik.sh b/tools/traefik.sh similarity index 100% rename from traefik.sh rename to tools/traefik.sh diff --git a/update_libseccomp2.sh b/tools/update_libseccomp2.sh similarity index 100% rename from update_libseccomp2.sh rename to tools/update_libseccomp2.sh diff --git a/update_portainer_agent.sh b/tools/update_portainer_agent.sh similarity index 100% rename from update_portainer_agent.sh rename to tools/update_portainer_agent.sh From 607d4dc56947356164dc8992797aea642c169d09 Mon Sep 17 00:00:00 2001 From: Robert Middleswarth <72569+rmiddle@users.noreply.github.com> Date: Mon, 1 Nov 2021 22:35:09 -0400 Subject: [PATCH 4/4] Clean up the documenations to reference the new tools folder. (#111) --- docs/README.md | 2 +- docs/nginx_proxy_manager.md | 4 ++-- docs/rpi_docker_monitor.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/README.md b/docs/README.md index f36cd08..38f83db 100644 --- a/docs/README.md +++ b/docs/README.md @@ -22,7 +22,7 @@ sudo dpkg-query -W libseccomp2 If you are running a version less that 2.5 you will need to run the upgrade script. ``` -wget -qO- https://git.io/JPsSb | bash +wget -qO- https://git.io/JPXdj | bash ``` ### Reboot for changes to take effect diff --git a/docs/nginx_proxy_manager.md b/docs/nginx_proxy_manager.md index a9f9a3c..5b846e9 100644 --- a/docs/nginx_proxy_manager.md +++ b/docs/nginx_proxy_manager.md @@ -18,13 +18,13 @@ First thing we need to do is setup the folder structure and install some files t Run the following script ``` -sudo ./tools/nginx-proxy-manager.sh +wget -qO- https://git.io/JPXF5 | sudo bash ``` Your output should look something like this ``` -# sudo ./tools/nginx-proxy-manager.sh +# wget -qO- https://git.io/JPXF5 | sudo bash Creating directories... Creating a blank nginx-proxy-manager config files Setup complete. You can now install the stack using the App Template. diff --git a/docs/rpi_docker_monitor.md b/docs/rpi_docker_monitor.md index 7af6d7f..a2fc6a3 100755 --- a/docs/rpi_docker_monitor.md +++ b/docs/rpi_docker_monitor.md @@ -69,13 +69,13 @@ First thing we need to do is setup the folder structure and install some files t Run the following script ``` -sudo ./tools/rpi_docker_monitor.sh +wget -qO- https://git.io/JPXba | sudo bash ``` Your output should look something like this ``` -# sudo ./tools/rpi_docker_monitor.sh +# wget -qO- https://git.io/JPXba | sudo bash creating directories downloading prometheus config files --2021-10-17 00:56:28-- https://raw.githubusercontent.com/oijkn/Docker-Raspberry-PI-Monitoring/main/prometheus/prometheus.yml