~hokiegeek/ansible-hokiegeek.net-common

f849f0343cee815d2c1c21d4025c670861809ff3 — HokieGeek 1 year, 2 months ago 51c2cab 2.2.4
tweaking how tiddlybucket is run and accessed
3 files changed, 3 insertions(+), 2 deletions(-)

M galaxy.yml
M roles/proxy/templates/caddy-proxy.service.j2
M roles/tiddlywiki/defaults/main.yml
M galaxy.yml => galaxy.yml +1 -1
@@ 8,7 8,7 @@ namespace: hokiegeek
name: hokiegeek_net_common

# The version of the collection. Must be compatible with semantic versioning
version: 2.2.3
version: 2.2.4

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md

M roles/proxy/templates/caddy-proxy.service.j2 => roles/proxy/templates/caddy-proxy.service.j2 +1 -1
@@ 9,7 9,7 @@ TimeoutStartSec=0
ExecStartPre=-/usr/bin/docker kill proxy
ExecStartPre=-/usr/bin/docker rm proxy

ExecStart=/usr/bin/docker run --name proxy --network {{ docker_network }} --publish 80:80 --publish 443:443 --publish 443:443/udp --volume "{{ proxy_conf_dir }}:/proxy-confs" --volume "{{ caddy_dir}}/Caddyfile:/etc/caddy/Caddyfile" --volume "{{ caddy_dir }}/data:/data"  --volume "{{ caddy_dir }}/config:/config" {{ caddy_image }}
ExecStart=/usr/bin/docker run --pull "always" --name proxy --network {{ docker_network }} --publish 80:80 --publish 443:443 --publish 443:443/udp --volume "{{ proxy_conf_dir }}:/proxy-confs" --volume "{{ caddy_dir}}/Caddyfile:/etc/caddy/Caddyfile" --volume "{{ caddy_dir }}/data:/data"  --volume "{{ caddy_dir }}/config:/config" {{ caddy_image }}

ExecStop=/usr/bin/docker stop proxy


M roles/tiddlywiki/defaults/main.yml => roles/tiddlywiki/defaults/main.yml +1 -0
@@ 1,4 1,5 @@
---
site_port: 8080
install_path:
tiddlywiki_run_commands:
wiki_service_env_file: /etc/systemd/system/wiki.env