From 666d29cd030aecd120b4d0410304b51c009c2aac Mon Sep 17 00:00:00 2001 From: jamesread Date: Tue, 2 Nov 2021 16:27:47 +0000 Subject: [PATCH] Consolidated configs --- configs/config.yaml => config.yaml | 0 configs/config.general.yaml | 53 ------------------- configs/config.individualPorts.yaml | 24 --------- .../config/config.hiddenNav.yaml | 14 ----- integration-tests/config/config.yaml | 53 ------------------- .../{config => configs}/config.general.yaml | 0 .../configs}/config.hiddenNav.yaml | 0 7 files changed, 144 deletions(-) rename configs/config.yaml => config.yaml (100%) delete mode 100644 configs/config.general.yaml delete mode 100644 configs/config.individualPorts.yaml delete mode 100644 integration-tests/config/config.hiddenNav.yaml delete mode 100644 integration-tests/config/config.yaml rename integration-tests/{config => configs}/config.general.yaml (100%) rename {configs => integration-tests/configs}/config.hiddenNav.yaml (100%) diff --git a/configs/config.yaml b/config.yaml similarity index 100% rename from configs/config.yaml rename to config.yaml diff --git a/configs/config.general.yaml b/configs/config.general.yaml deleted file mode 100644 index c5d9734..0000000 --- a/configs/config.general.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# There is a built-in micro proxy that will host the webui and REST API all on -# one port (this is called the "Single HTTP Frontend") and means you just need -# one open port in the container/firewalls/etc. -# -# Listen on all addresses available, port 1337 -listenAddressSingleHTTPFrontend: 0.0.0.0:1337 - -# Choose from INFO (default), WARN and DEBUG -logLevel: "INFO" - -# Actions (buttons) to show up on the WebUI: -actions: - # This will send 1 ping (-c 1) - # Docs: https://docs.olivetin.app/action-ping.html -- title: Ping Google.com - shell: ping google.com -c 1 - icon: ping - - # Restart lightdm on host "overseer" - # Docs: https://docs.olivetin.app/action-ping.html -- title: restart lightdm - icon: poop - shell: ssh root@overseer 'service lightdm restart' - -- title: sleep 2 seconds - shell: sleep 2 - icon: "🥱" - -- title: sleep 5 seconds (timeout) - shell: sleep 5 - icon: "😪" - - # OliveTin can run long-running jobs like Ansible playbooks. - # - # For such jobs, you will need to install ansible-playbook on the host where - # you are running OliveTin, or in the container. - # - # You probably want a much longer timeout as well (so that ansible completes). -- title: "Run Ansible Playbook" - icon: "🇦" - shell: ansible-playbook -i /etc/hosts /root/myRepo/myPlaybook.yaml - timeout: 120 - - # OliveTin can control containers - docker is just a command line app. - # - # However, if you are running in a container you will need to do some setup, - # see the docs below. - # - # Docs: https://docs.olivetin.app/action-container-control.html -- title: Restart Plex - icon: smile - shell: docker restart plex - diff --git a/configs/config.individualPorts.yaml b/configs/config.individualPorts.yaml deleted file mode 100644 index 04326a6..0000000 --- a/configs/config.individualPorts.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# WARNING -# This is considered an advanced installation of OliveTin, and 99% of users -# probably won't need this configuration file. If you're just getting started -# with OliveTin, don't use this. -# WARNING -# -# This tells OliveTin to not spawn the internal micro reverse proxy. -# -# This gives you more fine grained control, but requires quite a bit more setup. -# Most users will set this to "true" and use the built-in micro reverse proxy. -useSingleHTTPFrontend: false - -# The WebUI is simply a static webserver. OliveTin comes with one builtin to -# make things easy, but you can also host the "webui" directory on a static -# webserver. -#listenAddressWebUI: 0.0.0.0:1340 - -# The REST API is used by the WebUI. -#listenAddressRestActions: 0.0.0.0:1338 - -# The gRPC API is unsed by the WebUI, and can also be limited to localhost:1339. -#listenAddressGrpcActions: 0.0.0.0:1339 - - diff --git a/integration-tests/config/config.hiddenNav.yaml b/integration-tests/config/config.hiddenNav.yaml deleted file mode 100644 index 0bc7e8b..0000000 --- a/integration-tests/config/config.hiddenNav.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# There is a built-in micro proxy that will host the webui and REST API all on -# one port (this is called the "Single HTTP Frontend") and means you just need -# one open port in the container/firewalls/etc. -# -# Listen on all addresses available, port 1337 -listenAddressSingleHTTPFrontend: 0.0.0.0:1337 - -hideNavigation: true - -# Actions (buttons) to show up on the WebUI: -actions: -- title: Ping example.com - shell: ping example.com -c 1 - icon: ping diff --git a/integration-tests/config/config.yaml b/integration-tests/config/config.yaml deleted file mode 100644 index a4cb64d..0000000 --- a/integration-tests/config/config.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# There is a built-in micro proxy that will host the webui and REST API all on -# one port (this is called the "Single HTTP Frontend") and means you just need -# one open port in the container/firewalls/etc. -# -# Listen on all addresses available, port 1337 -listenAddressSingleHTTPFrontend: 0.0.0.0:1337 - -# Choose from INFO (default), WARN and DEBUG -logLevel: "DEBUG" - -# Actions (buttons) to show up on the WebUI: -actions: - # This will send 1 ping (-c 1) - # Docs: https://docs.olivetin.app/action-ping.html -- title: Ping Google.com - shell: ping google.com -c 1 - icon: ping - - # Restart lightdm on host "overseer" - # Docs: https://docs.olivetin.app/action-ping.html -- title: restart lightdm - icon: poop - shell: ssh root@overseer 'service lightdm restart' - -- title: sleep 2 seconds - shell: sleep 2 - icon: "🥱" - -- title: sleep 5 seconds (timeout) - shell: sleep 5 - icon: "😪" - - # OliveTin can run long-running jobs like Ansible playbooks. - # - # For such jobs, you will need to install ansible-playbook on the host where - # you are running OliveTin, or in the container. - # - # You probably want a much longer timeout as well (so that ansible completes). -- title: "Run Ansible Playbook" - icon: "🇦" - shell: ansible-playbook -i /etc/hosts /root/myRepo/myPlaybook.yaml - timeout: 120 - - # OliveTin can control containers - docker is just a command line app. - # - # However, if you are running in a container you will need to do some setup, - # see the docs below. - # - # Docs: https://docs.olivetin.app/action-container-control.html -- title: Restart Plex - icon: smile - shell: docker restart plex - diff --git a/integration-tests/config/config.general.yaml b/integration-tests/configs/config.general.yaml similarity index 100% rename from integration-tests/config/config.general.yaml rename to integration-tests/configs/config.general.yaml diff --git a/configs/config.hiddenNav.yaml b/integration-tests/configs/config.hiddenNav.yaml similarity index 100% rename from configs/config.hiddenNav.yaml rename to integration-tests/configs/config.hiddenNav.yaml