[mod] caddy 2.9.1
This commit is contained in:
parent
6d9c15a751
commit
3ee591bf80
5 changed files with 393 additions and 903 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
# @created 2022-03
|
# @created 2022-03
|
||||||
# author="Andy Bunce"
|
# author="Andy Bunce"
|
||||||
|
|
||||||
ARG VERSION=caddy:2.8.4
|
ARG VERSION=caddy:2.9.1
|
||||||
FROM $VERSION-builder AS builder
|
FROM $VERSION-builder AS builder
|
||||||
|
|
||||||
RUN xcaddy build \
|
RUN xcaddy build \
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
version: "3.7"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
caddy:
|
caddy:
|
||||||
image: caddy-saffron:1.0.6
|
image: caddy-saffron:1.0.7
|
||||||
build: .
|
build: .
|
||||||
container_name: caddy
|
container_name: caddy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 18 KiB |
91
caddy/site/quodatum/saffron.gv
Normal file
91
caddy/site/quodatum/saffron.gv
Normal file
|
|
@ -0,0 +1,91 @@
|
||||||
|
// the network
|
||||||
|
digraph saffron {
|
||||||
|
compound = true;
|
||||||
|
rankdir = LR;
|
||||||
|
|
||||||
|
rank = same;
|
||||||
|
nodesep = 0.5;
|
||||||
|
ranksep = 1.5;
|
||||||
|
node [fontname = "Arial"; shape = box; style = filled; width = "2"; target = "saffron";];
|
||||||
|
edge [fontname = "Arial";];
|
||||||
|
ratio = "0.8";
|
||||||
|
size = "100%";
|
||||||
|
subgraph cluster_x {
|
||||||
|
label = "The Internet ";
|
||||||
|
vpn [shape = circle;width = "0.75";];
|
||||||
|
subgraph cluster_a {
|
||||||
|
label = "quodatum.duckns.org";
|
||||||
|
bgcolor = "#BDFFA4";
|
||||||
|
a1 [label = "wiki";href = "https://wiki.quodatum.duckns.org";];
|
||||||
|
a2 [label = "about";href = "https://about.quodatum.duckns.org";];
|
||||||
|
a3 [label = "git";href = "https://git.quodatum.duckns.org";];
|
||||||
|
a4 [label = "vscode";href = "https://vscode.quodatum.duckns.org";];
|
||||||
|
}
|
||||||
|
subgraph cluster_b {
|
||||||
|
bgcolor = "#BDFFA4";
|
||||||
|
label = "orlop.duckns.org";
|
||||||
|
b1 [label = "about";href = "https://about.orlop.duckns.org";];
|
||||||
|
b2 [label = "kodi";href = "https://kodi.orlop.duckns.org";];
|
||||||
|
b3 [label = "tvheadend";];
|
||||||
|
href = "https://tvheadend.orlop.duckns.org";
|
||||||
|
b4 [label = "emby";href = "https://emby.orlop.duckns.org";];
|
||||||
|
b5 [label = "jellyfin";];
|
||||||
|
href = "https://jellyfin.orlop.duckns.org";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
subgraph cluster_s {
|
||||||
|
label = "servers";
|
||||||
|
subgraph cluster_c {
|
||||||
|
label = "xu4";
|
||||||
|
bgcolor = "#FFDEAD";
|
||||||
|
|
||||||
|
c2 [label = "tiddy-wiki:808";];
|
||||||
|
c0 [label = "caddy";];
|
||||||
|
c6 [label = "wireguard:51820";];
|
||||||
|
c8 [label = "pihole";];
|
||||||
|
}
|
||||||
|
subgraph cluster_d {
|
||||||
|
label = "fins";
|
||||||
|
bgcolor = "#FFDEAD";
|
||||||
|
d2 [label = "olama:11434";];
|
||||||
|
d4 [label = "openwebui:3001";href = "http://fins.local:3001/";];
|
||||||
|
d6 [label = "shotcut::3100";href = "http://fins.local:3100/";];
|
||||||
|
d8;
|
||||||
|
}
|
||||||
|
subgraph cluster_e {
|
||||||
|
label = "omv";
|
||||||
|
bgcolor = "#FFDEAD";
|
||||||
|
e1 [label = "forgejo:8300";href = "http://omv.local:8300";tooltip = "tvheadend";];
|
||||||
|
e2 [label = "jellyfin:8096";href = "http://omv.local:8096";tooltip = "tvheadend";];
|
||||||
|
e3 [label = "emby:8097";href = "http://omv.local:8097";tooltip = "emby";];
|
||||||
|
e4;
|
||||||
|
}
|
||||||
|
subgraph cluster_f {
|
||||||
|
label = "odroid-n2";
|
||||||
|
bgcolor = "#FFDEAD";
|
||||||
|
f1 [label = "kodi:8080";href = "http://odroid-n2:8080";tooltip = "kodi";];
|
||||||
|
f4;
|
||||||
|
f6;
|
||||||
|
f8;
|
||||||
|
}
|
||||||
|
subgraph cluster_g {
|
||||||
|
label = "n2-plus";
|
||||||
|
bgcolor = "#FFDEAD";
|
||||||
|
g1 [label = "tvheadend:9981";href = "http://n2-plus:9981";tooltip = "tvheadend";];
|
||||||
|
g2 [label = "portainer:9443";href = "https://n2-plus:9443";tooltip = "portainer";];
|
||||||
|
g3 [label = "netdata:19999";href = "http://n2-plus:19999";tooltip = "netdata";];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a1 -> c2;
|
||||||
|
a3 -> e1;
|
||||||
|
b2 -> f1;
|
||||||
|
b3 -> g1;
|
||||||
|
b4 -> e3;
|
||||||
|
b5 -> e2;
|
||||||
|
vpn -> c6;
|
||||||
|
c0 -> d2 [ltail = "cluster_c"; lhead = "cluster_d"; style = "dotted";];
|
||||||
|
c0 -> f1 [ltail = "cluster_c"; lhead = "cluster_f"; style = "dotted";];
|
||||||
|
c0 -> e1 [ltail = "cluster_c"; lhead = "cluster_e"; style = "dotted";];
|
||||||
|
c0 -> g1 [ltail = "cluster_c"; lhead = "cluster_g"; style = "dotted";];
|
||||||
|
}
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
version: '2'
|
|
||||||
|
|
||||||
services:
|
|
||||||
drone-server:
|
|
||||||
image: drone/drone
|
|
||||||
|
|
||||||
ports:
|
|
||||||
- 80:80
|
|
||||||
volumes:
|
|
||||||
- ./drone-server-data:/var/lib/drone/
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
- DRONE_SERVER_HOST=drone.quodatum.duckdns.org
|
|
||||||
- DRONE_SERVER_PROTO=https
|
|
||||||
- DRONE_GITEA_SERVER=https://git.quodatum.duckdns.org/
|
|
||||||
- DRONE_GITEA_CLIENT_ID=607bc1aa-2491-4193-8e6b-a82d2dd05be0
|
|
||||||
- DRONE_GITEA_CLIENT_SECRET=HZgKI4c353aqNPOhTgjJ5WUttYnVKYp9omifezS-dLM=
|
|
||||||
- DRONE_RPC_SECRET=06522d7b764c0d05138e79ab7c8c341e
|
|
||||||
- DRONE_USER_CREATE=username:apb,admin:true
|
|
||||||
Loading…
Add table
Reference in a new issue