Compare commits
46
Commits
a59982b463
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6eff9a41d9 | ||
|
|
85878fdea3 | ||
|
|
fff689f7ef | ||
|
|
2a7bbfd5b5 | ||
|
|
9c7ac07e00 | ||
|
|
9f34f8aa22 | ||
|
|
5b8f3579d4 | ||
|
|
4255a46631 | ||
|
|
143f3fee76 | ||
|
|
bec88ce7b3 | ||
|
|
dde2595990 | ||
|
|
74944410dc | ||
|
|
cca5db5acb | ||
|
|
ad6de45a32 | ||
|
|
e625f7f505 | ||
|
|
812298e5ad | ||
|
|
b135f9e430 | ||
|
|
1d3eb276ca | ||
|
|
3b506670dd | ||
|
|
6068741562 | ||
|
|
9afb2deda0 | ||
|
|
7aeaa1eef5 | ||
|
|
a712cf786b | ||
|
|
490c4f3fac | ||
|
|
3bf6fc4104 | ||
|
|
e140109e20 | ||
|
|
f2218d5bdd | ||
|
|
07bb118144 | ||
|
|
6fe3650f92 | ||
|
|
29dfb9ff8c | ||
|
|
90cf5f46ca | ||
|
|
7fdc0ea6b1 | ||
|
|
0e73defb9a | ||
|
|
232306b1b6 | ||
|
|
2c13a0da72 | ||
|
|
ffa11cfb78 | ||
|
|
ea04ef56e5 | ||
|
|
293f17f318 | ||
|
|
0ab70b27f1 | ||
|
|
6e47b3a70f | ||
|
|
0a9bcb38c8 | ||
|
|
0ed939c1ab | ||
|
|
fdc7d8d853 | ||
|
|
e47326fca5 | ||
|
|
b666c5f43c | ||
|
|
088690fe83 |
@@ -11,6 +11,6 @@ jobs:
|
|||||||
- name: Check out repo
|
- name: Check out repo
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- run: python3 -m venv venv
|
- run: python3 -m venv venv
|
||||||
- run: venv/bin/pip --disable-pip-version-check install ansible==11.1.0 ansible-lint==24.12.1
|
- run: venv/bin/pip --disable-pip-version-check install ansible==12.0.0 ansible-lint==25.8.2
|
||||||
- run: venv/bin/ansible-lint -c .ansible-lint ansible
|
- run: venv/bin/ansible-lint -c .ansible-lint ansible
|
||||||
# TODO: Reimplement ansible-play --check step from old drone config
|
# TODO: Reimplement ansible-play --check step from old drone config
|
||||||
|
|||||||
@@ -21,3 +21,6 @@ to avoid checking for a new version every single run.
|
|||||||
## TODO
|
## TODO
|
||||||
|
|
||||||
- [x] Migrate to `community.docker.docker_compose_v2` (`v1` is deprecated)
|
- [x] Migrate to `community.docker.docker_compose_v2` (`v1` is deprecated)
|
||||||
|
- [x] Nix Gitea Action runner
|
||||||
|
- [x] Install but disable zomboid server
|
||||||
|
- [x] Download volume for yore
|
||||||
|
|||||||
@@ -13,3 +13,6 @@ gods_users:
|
|||||||
- name: caddy
|
- name: caddy
|
||||||
uid: 42002
|
uid: 42002
|
||||||
state: present
|
state: present
|
||||||
|
- name: yore
|
||||||
|
uid: 42004
|
||||||
|
state: present
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
$ANSIBLE_VAULT;1.1;AES256
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
37646262396235383766303137613134323330396364346261653036303935663935323930663630
|
62643463383563343863376537643438356663636666356636346465613165363231653664323164
|
||||||
3562306337383765323635623838646538376362396638360a366336336134616163663533373836
|
3137343761613064616566656133346339613462333330360a626431653366643162316435373066
|
||||||
30333834306466633162613264376266646239343432646162396132643437663934613464363437
|
65323863373361363765623563653863366338616564623532363233646466316539376666356564
|
||||||
6530653234336133360a666232386537353835386364613065343063613536613638393736666635
|
3034393930376630350a396632393262316238663162346533343464386135666364383663313539
|
||||||
65363362363766353231646461343764306637353465373633363861333436336263393561656330
|
63393536353334666432393639616130636232343630626235663337393438336430666637663133
|
||||||
39613761373437313663613737613961666330373135666365373433376437383232383461633861
|
65316161646161376333376330353063363966383936396566323633366435663835346564356137
|
||||||
333763383538633430303663636338363537
|
65633262623133373865643230303236663532623863386264326662393364396636306537653264
|
||||||
|
62326264393039343733643138313639333635366532383137613131656163356534303738336338
|
||||||
|
6339
|
||||||
|
|||||||
@@ -44,19 +44,31 @@
|
|||||||
- name: Upload and decrypt docker environment vars
|
- name: Upload and decrypt docker environment vars
|
||||||
become: true
|
become: true
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
src: "../../docker/envs/{{ item.name }}/.env"
|
src: "../../docker/envs/{{ item.path }}"
|
||||||
dest: /etc/pbri/docker/{{ item.name }}/.env
|
dest: "/etc/pbri/docker/{{ item.path }}"
|
||||||
# Files should inaccessible to non-root users.
|
# Files should inaccessible to non-root users.
|
||||||
mode: u=rw,g=,o=
|
mode: u=rw,g=,o=
|
||||||
# This is true by default but I put it here anyways
|
# This is true by default but I put it here anyways
|
||||||
# to emphasize what's happening
|
# to emphasize what's happening
|
||||||
decrypt: true
|
decrypt: true
|
||||||
loop:
|
loop:
|
||||||
- name: gitea
|
- path: caddy/Caddyfile
|
||||||
state: present
|
state: present
|
||||||
- name: codi
|
- path: gitea/.env
|
||||||
state: present
|
state: present
|
||||||
- name: vrnp
|
- path: codi/.env
|
||||||
|
state: present
|
||||||
|
- path: vrnp/.env
|
||||||
|
state: present
|
||||||
|
- path: zomboid/.env
|
||||||
|
state: present
|
||||||
|
- path: yore/.env
|
||||||
|
state: present
|
||||||
|
- path: factorio/.env
|
||||||
|
state: present
|
||||||
|
- path: hitparade/.env
|
||||||
|
state: present
|
||||||
|
- path: hitparade/pollmaster-config.yml
|
||||||
state: present
|
state: present
|
||||||
# This needs to be done for any services where user:
|
# This needs to be done for any services where user:
|
||||||
# is set in docker-compose.yaml.
|
# is set in docker-compose.yaml.
|
||||||
@@ -75,6 +87,14 @@
|
|||||||
user: caddy
|
user: caddy
|
||||||
- name: codi_uploads
|
- name: codi_uploads
|
||||||
user: hackmd
|
user: hackmd
|
||||||
|
- name: nix_runner_etc
|
||||||
|
user: 1000
|
||||||
|
- name: nix_runner_nix
|
||||||
|
user: 1000
|
||||||
|
- name: nix_runner_home_node
|
||||||
|
user: 1000
|
||||||
|
- name: yore_data
|
||||||
|
user: yore
|
||||||
# Since some docker-compose configuration might want to pull
|
# Since some docker-compose configuration might want to pull
|
||||||
# images from the Gitea package repository, we need to ensure
|
# images from the Gitea package repository, we need to ensure
|
||||||
# that Gitea is reachable before those configurations are deployed.
|
# that Gitea is reachable before those configurations are deployed.
|
||||||
@@ -115,3 +135,11 @@
|
|||||||
state: present
|
state: present
|
||||||
- name: vrnp
|
- name: vrnp
|
||||||
state: present
|
state: present
|
||||||
|
- name: yore
|
||||||
|
state: present
|
||||||
|
- name: hitparade
|
||||||
|
state: present
|
||||||
|
- name: factorio
|
||||||
|
state: absent
|
||||||
|
- name: zomboid
|
||||||
|
state: absent
|
||||||
|
|||||||
@@ -20,6 +20,86 @@
|
|||||||
- name: Install and set up Docker and docker-compose
|
- name: Install and set up Docker and docker-compose
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: docker
|
name: docker
|
||||||
|
- name: Add Davids group
|
||||||
|
become: true
|
||||||
|
ansible.builtin.group:
|
||||||
|
name: "david"
|
||||||
|
state: "present"
|
||||||
|
- name: Add David
|
||||||
|
become: true
|
||||||
|
ansible.builtin.user:
|
||||||
|
name: "david"
|
||||||
|
group: "david"
|
||||||
|
state: "present"
|
||||||
|
shell: "/bin/bash"
|
||||||
|
# Disable password auth
|
||||||
|
password: "!"
|
||||||
|
- name: Create David SSH directory
|
||||||
|
become: true
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: /home/david/.ssh
|
||||||
|
owner: david
|
||||||
|
group: david
|
||||||
|
state: directory
|
||||||
|
mode: "0700"
|
||||||
|
- name: Set David SSH key
|
||||||
|
become: true
|
||||||
|
ansible.builtin.lineinfile:
|
||||||
|
path: /home/david/.ssh/authorized_keys
|
||||||
|
line: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICttSQcZsKvw5qKCDGt\
|
||||||
|
nxEdyH1aEGOGGRqDCp3U/SG46 davidtanner@coolerLaptop2.fritz.box"
|
||||||
|
owner: david
|
||||||
|
group: david
|
||||||
|
create: true
|
||||||
|
state: present
|
||||||
|
mode: "0600"
|
||||||
|
- name: Add Jakobs group
|
||||||
|
become: true
|
||||||
|
ansible.builtin.group:
|
||||||
|
name: "jakob"
|
||||||
|
state: "present"
|
||||||
|
- name: Add Jakob
|
||||||
|
become: true
|
||||||
|
ansible.builtin.user:
|
||||||
|
name: "jakob"
|
||||||
|
group: "jakob"
|
||||||
|
state: "present"
|
||||||
|
shell: "/bin/bash"
|
||||||
|
append: true
|
||||||
|
groups:
|
||||||
|
- sudo
|
||||||
|
- name: Create Jakob SSH directory
|
||||||
|
become: true
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: /home/jakob/.ssh
|
||||||
|
owner: jakob
|
||||||
|
group: jakob
|
||||||
|
state: directory
|
||||||
|
mode: "0700"
|
||||||
|
- name: Set Jakob SSH key
|
||||||
|
become: true
|
||||||
|
ansible.builtin.lineinfile:
|
||||||
|
path: /home/jakob/.ssh/authorized_keys
|
||||||
|
line: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzStuc1f7CfTsmp1qLz5x/YCwJ2wHVjxOv2Fvocs3xH pbrinkmeier.de@jakob.moser.contact"
|
||||||
|
owner: jakob
|
||||||
|
group: jakob
|
||||||
|
create: true
|
||||||
|
state: present
|
||||||
|
mode: "0600"
|
||||||
|
- name: Add work SSH key
|
||||||
|
become: true
|
||||||
|
ansible.builtin.lineinfile:
|
||||||
|
path: /home/paul/.ssh/authorized_keys
|
||||||
|
line: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMeHrSd8NJ9dAoQEJez\
|
||||||
|
FbxfbWlo/HQNoA8vaaBZj58Cp paul@MacBook-Pro.meqo"
|
||||||
|
owner: paul
|
||||||
|
group: paul
|
||||||
|
create: true
|
||||||
|
state: present
|
||||||
|
mode: "0600"
|
||||||
|
- name: Install Nix
|
||||||
|
ansible.builtin.include_role:
|
||||||
|
name: install_nix
|
||||||
|
|
||||||
handlers:
|
handlers:
|
||||||
- name: Restart sshd
|
- name: Restart sshd
|
||||||
|
|||||||
@@ -10,9 +10,41 @@
|
|||||||
checkouts:
|
checkouts:
|
||||||
- path: /home/paul/Sites/pbrinkmeier.de
|
- path: /home/paul/Sites/pbrinkmeier.de
|
||||||
url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de
|
url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de
|
||||||
commit: bab3208e61972851a5e609930a05e0d4322f8a06
|
commit: 1df3566997535ab563b5fa76724a8c6c55b96483
|
||||||
owner: paul
|
owner: paul
|
||||||
- path: /home/paul/Sites/tichy.click
|
- path: /home/paul/Sites/tichy.click
|
||||||
url: https://github.com/pbrinkmeier/tichy-clicker
|
url: https://github.com/pbrinkmeier/tichy-clicker
|
||||||
commit: 7dfb14183c765e3661fda84a7e89c2f73ca86f26
|
commit: 7dfb14183c765e3661fda84a7e89c2f73ca86f26
|
||||||
owner: paul
|
owner: paul
|
||||||
|
- name: Create David Sites directory
|
||||||
|
become: true
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: /home/david/Sites
|
||||||
|
state: directory
|
||||||
|
owner: david
|
||||||
|
group: david
|
||||||
|
mode: "0755"
|
||||||
|
- name: Create dt.beany.club directory
|
||||||
|
become: true
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: /home/david/Sites/dt.beany.club
|
||||||
|
state: directory
|
||||||
|
owner: david
|
||||||
|
group: david
|
||||||
|
mode: "0775"
|
||||||
|
- name: Create vorschlagzumklangvongeschichtsschreibendenprozessen.de directory
|
||||||
|
become: true
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: /home/david/Sites/vorschlagzumklangvongeschichtsschreibendenprozessen.de
|
||||||
|
state: directory
|
||||||
|
owner: david
|
||||||
|
group: david
|
||||||
|
mode: "0775"
|
||||||
|
- name: Create beany.club directory
|
||||||
|
become: true
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: /home/paul/Sites/beany.club
|
||||||
|
state: directory
|
||||||
|
owner: paul
|
||||||
|
group: paul
|
||||||
|
mode: "0775"
|
||||||
|
|||||||
@@ -26,38 +26,43 @@ require_util() {
|
|||||||
|
|
||||||
case "$(uname -s).$(uname -m)" in
|
case "$(uname -s).$(uname -m)" in
|
||||||
Linux.x86_64)
|
Linux.x86_64)
|
||||||
hash=0b32afd8c9147532bf8ce8908395b1b4d6dde9bedb0fcf5ace8b9fe0bd4c075c
|
hash=d1f67c86eed016214864ba08bfb9529c307aea7e8fafb74853f96fcc3bfd8a60
|
||||||
path=0zij5bm5f2gm3p2c8dkkv58684j1k100/nix-2.8.0-x86_64-linux.tar.xz
|
path=n1j9ng0120ql98l5a8mi626ka8wvixq4/nix-2.31.2-x86_64-linux.tar.xz
|
||||||
system=x86_64-linux
|
system=x86_64-linux
|
||||||
;;
|
;;
|
||||||
Linux.i?86)
|
Linux.i?86)
|
||||||
hash=3f4bb50f639515df069fb682bb68da77565e5ca8678a3b0fb7dcc79ef591f518
|
hash=9e8a403421c68683557180444f089861469e12b41d41ee2f9be4c8e731b7d160
|
||||||
path=kjpj1rn6x5lh20fkyfyyzgmgjdra1jpy/nix-2.8.0-i686-linux.tar.xz
|
path=zjcwglfyf0fvjb4j86kgijzwhzaqbngc/nix-2.31.2-i686-linux.tar.xz
|
||||||
system=i686-linux
|
system=i686-linux
|
||||||
;;
|
;;
|
||||||
Linux.aarch64)
|
Linux.aarch64)
|
||||||
hash=d29ea31c581e1ba7a651e6b22999cef8923e852e1d6fe7008d9545f4275f5343
|
hash=64db528412096d718b4bf8f78f85e5ac2b714b774e5005500dee37d23f560456
|
||||||
path=npadny2da5149lcycbfmacf1r936n9zg/nix-2.8.0-aarch64-linux.tar.xz
|
path=0aw1ka8njh94nvjy8596va5bbx4wd2nw/nix-2.31.2-aarch64-linux.tar.xz
|
||||||
system=aarch64-linux
|
system=aarch64-linux
|
||||||
;;
|
;;
|
||||||
Linux.armv6l_linux)
|
Linux.armv6l)
|
||||||
hash=69d5cb0e95bc83154099debd139d4f767622d94b17149fa127d492017c2e3896
|
hash=5e088d3f4fe27dd35991b1888c1ea5284edade24965328604968b9a1cc20a94c
|
||||||
path=jb1l7y40im5dsbq5gamppss59y0c7jmj/nix-2.8.0-armv6l-linux.tar.xz
|
path=2pzkwf2ysf0znsnz5i9gfn6w2gikhlys/nix-2.31.2-armv6l-linux.tar.xz
|
||||||
system=armv6l-linux
|
system=armv6l-linux
|
||||||
;;
|
;;
|
||||||
Linux.armv7l_linux)
|
Linux.armv7l)
|
||||||
hash=25857729f23dc25fe92dabd376917d83fe0f23038f82c1f2ab230171eb70f648
|
hash=4e2c1e8a3172ae71f041b9b647aa8153fb24518272d1a9bc3d9b384ab7ad54a1
|
||||||
path=firp24ikxcygwrwd4208lyla4b6jl3sh/nix-2.8.0-armv7l-linux.tar.xz
|
path=nkp9wbvnsxinr9xl7sn0yy96wvc4chn0/nix-2.31.2-armv7l-linux.tar.xz
|
||||||
system=armv7l-linux
|
system=armv7l-linux
|
||||||
;;
|
;;
|
||||||
|
Linux.riscv64)
|
||||||
|
hash=79601e08b6389df130b5bf1e0a48590aea044ac18bc61660545cf65843b39251
|
||||||
|
path=dhqxgwygm94vd6rdiwscxxz98kh8jal3/nix-2.31.2-riscv64-linux.tar.xz
|
||||||
|
system=riscv64-linux
|
||||||
|
;;
|
||||||
Darwin.x86_64)
|
Darwin.x86_64)
|
||||||
hash=ebf383f1b499d3e4897cd61d068dc46e118e5f53667f5f28748b0b3682d7649a
|
hash=ed8df6a1046dea90ba4068a827bdeaf372d522867c4d2b48cdb37145c200eeba
|
||||||
path=wwf7b61nyhgj3z0vvgnnb4yzi081jkjp/nix-2.8.0-x86_64-darwin.tar.xz
|
path=5zp5bzz45sn9ff2bfhh03cmavvm1r6gs/nix-2.31.2-x86_64-darwin.tar.xz
|
||||||
system=x86_64-darwin
|
system=x86_64-darwin
|
||||||
;;
|
;;
|
||||||
Darwin.arm64|Darwin.aarch64)
|
Darwin.arm64|Darwin.aarch64)
|
||||||
hash=f320f381299e0fc2f907ae81ac123d0689245cb39f0672f8a65dffea12fa0240
|
hash=3baa0af88a1ef4e2cc82cb64cd384b1805ecc3771b574e97277ae213d52711d8
|
||||||
path=fr5rcinvqzgcrggxw3phrzcck9wpzz83/nix-2.8.0-aarch64-darwin.tar.xz
|
path=b7hidzsb4i3gx6s23ig9mp7mwmiljzfk/nix-2.31.2-aarch64-darwin.tar.xz
|
||||||
system=aarch64-darwin
|
system=aarch64-darwin
|
||||||
;;
|
;;
|
||||||
*) oops "sorry, there is no binary distribution of Nix for your platform";;
|
*) oops "sorry, there is no binary distribution of Nix for your platform";;
|
||||||
@@ -71,10 +76,10 @@ if [ "${1:-}" = "--tarball-url-prefix" ]; then
|
|||||||
url=${2}/${path}
|
url=${2}/${path}
|
||||||
shift 2
|
shift 2
|
||||||
else
|
else
|
||||||
url=https://releases.nixos.org/nix/nix-2.8.0/nix-2.8.0-$system.tar.xz
|
url=https://releases.nixos.org/nix/nix-2.31.2/nix-2.31.2-$system.tar.xz
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tarball=$tmpDir/nix-2.8.0-$system.tar.xz
|
tarball=$tmpDir/nix-2.31.2-$system.tar.xz
|
||||||
|
|
||||||
require_util tar "unpack the binary tarball"
|
require_util tar "unpack the binary tarball"
|
||||||
if [ "$(uname -s)" != "Darwin" ]; then
|
if [ "$(uname -s)" != "Darwin" ]; then
|
||||||
@@ -89,7 +94,7 @@ else
|
|||||||
oops "you don't have wget or curl installed, which I need to download the binary tarball"
|
oops "you don't have wget or curl installed, which I need to download the binary tarball"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "downloading Nix 2.8.0 binary tarball for $system from '$url' to '$tmpDir'..."
|
echo "downloading Nix 2.31.2 binary tarball for $system from '$url' to '$tmpDir'..."
|
||||||
fetch "$url" "$tarball" || oops "failed to download '$url'"
|
fetch "$url" "$tarball" || oops "failed to download '$url'"
|
||||||
|
|
||||||
if command -v sha256sum > /dev/null 2>&1; then
|
if command -v sha256sum > /dev/null 2>&1; then
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
{
|
|
||||||
admin off
|
|
||||||
}
|
|
||||||
|
|
||||||
pbrinkmeier.de {
|
|
||||||
file_server {
|
|
||||||
root /srv/pbrinkmeier.de
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tichy.click {
|
|
||||||
file_server {
|
|
||||||
root /srv/tichy.click
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
codi.pbrinkmeier.de {
|
|
||||||
redir https://pad.pbrinkmeier.de{uri} permanent
|
|
||||||
}
|
|
||||||
|
|
||||||
pad.pbrinkmeier.de {
|
|
||||||
reverse_proxy codi:3000
|
|
||||||
}
|
|
||||||
|
|
||||||
git.pbrinkmeier.de {
|
|
||||||
reverse_proxy gitea:3000
|
|
||||||
}
|
|
||||||
|
|
||||||
ci.pbrinkmeier.de {
|
|
||||||
reverse_proxy drone:80
|
|
||||||
}
|
|
||||||
|
|
||||||
jupyter.pbrinkmeier.de {
|
|
||||||
reverse_proxy jupyter:8888
|
|
||||||
basicauth {
|
|
||||||
wug JDJhJDE0JEJrQXUzVWxFZ2JGVmx6YlZWTkpYdy5IMjRXdnZZdGw5SjZDcUg2ZWMxOEVjcEV6dWhIRmhD
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
plantuml.pbrinkmeier.de {
|
|
||||||
reverse_proxy codi_plantuml:8080
|
|
||||||
}
|
|
||||||
|
|
||||||
utoy.beany.club {
|
|
||||||
reverse_proxy utoy:3000
|
|
||||||
}
|
|
||||||
|
|
||||||
vrnp.beany.club {
|
|
||||||
reverse_proxy vrnp:8000
|
|
||||||
}
|
|
||||||
@@ -6,11 +6,20 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
|
# For hitparade/pollmaster
|
||||||
|
- "12080:12080"
|
||||||
|
- "12081:12081"
|
||||||
user: "42002"
|
user: "42002"
|
||||||
volumes:
|
volumes:
|
||||||
- /var/lib/pbri/docker/caddy_data:/data
|
- /var/lib/pbri/docker/caddy_data:/data
|
||||||
- /var/lib/pbri/docker/caddy_config:/config
|
- /var/lib/pbri/docker/caddy_config:/config
|
||||||
- /home/paul/Sites:/srv:ro
|
# See nanna-sites playbook/Caddyfile
|
||||||
|
- /home/david/Sites/dt.beany.club:/srv/dt.beany.club:ro
|
||||||
|
- /home/david/Sites/vorschlagzumklangvongeschichtsschreibendenprozessen.de:/srv/vorschlagzumklangvongeschichtsschreibendenprozessen.de:ro
|
||||||
|
- /home/paul/Sites/files.pbrinkmeier.de:/srv/files.pbrinkmeier.de:ro
|
||||||
|
- /home/paul/Sites/pbrinkmeier.de:/srv/pbrinkmeier.de:ro
|
||||||
|
- /home/paul/Sites/tichy.click:/srv/tichy.click:ro
|
||||||
|
- /home/paul/Sites/beany.club:/srv/beany.club:ro
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
FROM factoriotools/factorio:2.0.73
|
||||||
|
|
||||||
|
COPY server-settings.json /server-settings.json
|
||||||
|
ENTRYPOINT [ "/bin/sh", "-c", "mkdir -p /factorio/config && envsubst < /server-settings.json > /factorio/config/server-settings.json && exec /docker-entrypoint.sh" ]
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# factorio
|
||||||
|
|
||||||
|
Add a `.env` file like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
GAME_PASSWORD=...
|
||||||
|
```
|
||||||
|
|
||||||
|
Environment variables are put into `server-settings.json` during startup using `envsubst`.
|
||||||
|
See also: https://hub.docker.com/r/factoriotools/factorio.
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
---
|
||||||
|
|
||||||
|
services:
|
||||||
|
factorio:
|
||||||
|
image: pbrinkmeier/factorio
|
||||||
|
build: .
|
||||||
|
restart: always
|
||||||
|
environment:
|
||||||
|
GAME_PASSWORD: "${GAME_PASSWORD}"
|
||||||
|
DLC_SPACE_AGE: false
|
||||||
|
volumes:
|
||||||
|
- /var/lib/pbri/docker/factorio:/factorio
|
||||||
|
ports:
|
||||||
|
- "34197:34197/udp"
|
||||||
|
- "27015:27015/tcp"
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
{
|
||||||
|
"name": "le epic factorio server",
|
||||||
|
"description": "Description of the game that will appear in the listing",
|
||||||
|
"tags": ["game", "tags"],
|
||||||
|
|
||||||
|
"_comment_max_players": "Maximum number of players allowed, admins can join even a full server. 0 means unlimited.",
|
||||||
|
"max_players": 0,
|
||||||
|
|
||||||
|
"_comment_visibility": ["public: Game will be published on the official Factorio matching server",
|
||||||
|
"lan: Game will be broadcast on LAN"],
|
||||||
|
"visibility":
|
||||||
|
{
|
||||||
|
"public": false,
|
||||||
|
"lan": false
|
||||||
|
},
|
||||||
|
|
||||||
|
"_comment_credentials": "Your factorio.com login credentials. Required for games with visibility public",
|
||||||
|
"username": "",
|
||||||
|
"password": "",
|
||||||
|
|
||||||
|
"_comment_token": "Authentication token. May be used instead of 'password' above.",
|
||||||
|
"token": "",
|
||||||
|
|
||||||
|
"game_password": "${GAME_PASSWORD}",
|
||||||
|
|
||||||
|
"_comment_require_user_verification": "When set to true, the server will only allow clients that have a valid Factorio.com account",
|
||||||
|
"require_user_verification": false,
|
||||||
|
|
||||||
|
"_comment_max_upload_in_kilobytes_per_second" : "optional, default value is 0. 0 means unlimited.",
|
||||||
|
"max_upload_in_kilobytes_per_second": 0,
|
||||||
|
|
||||||
|
"_comment_max_upload_slots" : "optional, default value is 5. 0 means unlimited.",
|
||||||
|
"max_upload_slots": 5,
|
||||||
|
|
||||||
|
"_comment_minimum_latency_in_ticks": "optional one tick is 16ms in default speed, default value is 0. 0 means no minimum.",
|
||||||
|
"minimum_latency_in_ticks": 0,
|
||||||
|
|
||||||
|
"_comment_max_heartbeats_per_second": "Network tick rate. Maximum rate game updates packets are sent at before bundling them together. Minimum value is 6, maximum value is 240.",
|
||||||
|
"max_heartbeats_per_second": 60,
|
||||||
|
|
||||||
|
"_comment_ignore_player_limit_for_returning_players": "Players that played on this map already can join even when the max player limit was reached.",
|
||||||
|
"ignore_player_limit_for_returning_players": false,
|
||||||
|
|
||||||
|
"_comment_allow_commands": "possible values are, true, false and admins-only",
|
||||||
|
"allow_commands": "admins-only",
|
||||||
|
|
||||||
|
"_comment_autosave_interval": "Autosave interval in minutes",
|
||||||
|
"autosave_interval": 10,
|
||||||
|
|
||||||
|
"_comment_autosave_slots": "server autosave slots, it is cycled through when the server autosaves.",
|
||||||
|
"autosave_slots": 5,
|
||||||
|
|
||||||
|
"_comment_afk_autokick_interval": "How many minutes until someone is kicked when doing nothing, 0 for never.",
|
||||||
|
"afk_autokick_interval": 5,
|
||||||
|
|
||||||
|
"_comment_auto_pause": "Whether should the server be paused when no players are present.",
|
||||||
|
"auto_pause": true,
|
||||||
|
|
||||||
|
"only_admins_can_pause_the_game": true,
|
||||||
|
|
||||||
|
"_comment_autosave_only_on_server": "Whether autosaves should be saved only on server or also on all connected clients. Default is true.",
|
||||||
|
"autosave_only_on_server": true,
|
||||||
|
|
||||||
|
"_comment_non_blocking_saving": "Highly experimental feature, enable only at your own risk of losing your saves. On UNIX systems, server will fork itself to create an autosave. Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.",
|
||||||
|
"non_blocking_saving": false,
|
||||||
|
|
||||||
|
"_comment_segment_sizes": "Long network messages are split into segments that are sent over multiple ticks. Their size depends on the number of peers currently connected. Increasing the segment size will increase upload bandwidth requirement for the server and download bandwidth requirement for clients. This setting only affects server outbound messages. Changing these settings can have a negative impact on connection stability for some clients.",
|
||||||
|
"minimum_segment_size": 25,
|
||||||
|
"minimum_segment_size_peer_count": 20,
|
||||||
|
"maximum_segment_size": 100,
|
||||||
|
"maximum_segment_size_peer_count": 10
|
||||||
|
}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
FROM gitea/act_runner:0.2.11
|
FROM gitea/runner:3.0.0
|
||||||
|
|
||||||
COPY runner-config.yaml /opt/runner-config.yaml
|
COPY runner-config.yaml /opt/runner-config.yaml
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
gitea:
|
gitea:
|
||||||
image: gitea/gitea:1.21.11
|
image: gitea/gitea:1.27.3
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
# Ref: https://docs.gitea.io/en-us/config-cheat-sheet
|
# Ref: https://docs.gitea.io/en-us/config-cheat-sheet
|
||||||
@@ -23,8 +23,6 @@ services:
|
|||||||
GITEA__database__NAME: gitea
|
GITEA__database__NAME: gitea
|
||||||
GITEA__database__USER: gitea
|
GITEA__database__USER: gitea
|
||||||
GITEA__database__PASSWD: "${GITEA_DB_PASSWORD}"
|
GITEA__database__PASSWD: "${GITEA_DB_PASSWORD}"
|
||||||
GITEA__picture__DISABLE_GRAVATAR: "true"
|
|
||||||
GITEA__picture__FEDERATED_AVATAR: "false"
|
|
||||||
GITEA__service__DISABLE_REGISTRATION: "true"
|
GITEA__service__DISABLE_REGISTRATION: "true"
|
||||||
GITEA__service__REGISTER_EMAIL_CONFIRM: "true"
|
GITEA__service__REGISTER_EMAIL_CONFIRM: "true"
|
||||||
GITEA__service__ENABLE_NOTIFY_MAIL: "true"
|
GITEA__service__ENABLE_NOTIFY_MAIL: "true"
|
||||||
@@ -65,7 +63,7 @@ services:
|
|||||||
|
|
||||||
gitea_runner:
|
gitea_runner:
|
||||||
# Make sure to keep this in sync with the version in the Dockerfile
|
# Make sure to keep this in sync with the version in the Dockerfile
|
||||||
image: pbrinkmeier/act_runner:0.2.11
|
image: pbrinkmeier/gitea-runner:3.0.0
|
||||||
build: .
|
build: .
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -74,7 +74,10 @@ container:
|
|||||||
# If you want to allow any volume, please use the following configuration:
|
# If you want to allow any volume, please use the following configuration:
|
||||||
# valid_volumes:
|
# valid_volumes:
|
||||||
# - '**'
|
# - '**'
|
||||||
valid_volumes: []
|
valid_volumes:
|
||||||
|
- /var/lib/pbri/docker/nix_runner_etc
|
||||||
|
- /var/lib/pbri/docker/nix_runner_nix
|
||||||
|
- /var/lib/pbri/docker/nix_runner_home_node
|
||||||
# overrides the docker client host with the specified one.
|
# overrides the docker client host with the specified one.
|
||||||
# If it's empty, act_runner will find an available docker host automatically.
|
# If it's empty, act_runner will find an available docker host automatically.
|
||||||
# If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
|
# If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
FROM mariadb:10.6
|
||||||
|
|
||||||
|
COPY pollmaster_scheme.sql /docker-entrypoint-initdb.d/init.sql
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
services:
|
||||||
|
pollmaster_db:
|
||||||
|
image: pbrinkmeier/pollmaster_db
|
||||||
|
build: .
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}"
|
||||||
|
MYSQL_DATABASE: 'pollmaster'
|
||||||
|
MYSQL_USER: 'pollmaster'
|
||||||
|
MYSQL_PASSWORD: "${MYSQL_PASSWORD}"
|
||||||
|
volumes:
|
||||||
|
- /var/lib/pbri/docker/hitparade_pollmaster_db_data:/var/lib/mysql
|
||||||
|
|
||||||
|
# Caddy terminates https for :12080 and :12081
|
||||||
|
pollmaster:
|
||||||
|
image: git.pbrinkmeier.de/paul/pollmaster:4
|
||||||
|
volumes:
|
||||||
|
- /etc/pbri/docker/hitparade/pollmaster-config.yml:/config.yml:ro
|
||||||
|
- /var/lib/pbri/docker/pollmaster_sessions:/app/pollmaster/sessions
|
||||||
|
depends_on:
|
||||||
|
- pollmaster_db
|
||||||
|
|
||||||
|
# Doesn't need further config, the pollmaster URL is baked into the image
|
||||||
|
voter:
|
||||||
|
image: git.pbrinkmeier.de/paul/voter:4
|
||||||
|
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
|
name: caddy-network
|
||||||
|
external: true
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS `admin` (
|
||||||
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`image` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
UNIQUE KEY `Schlüssel 2` (`name`) USING BTREE
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `artist` (
|
||||||
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`name` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`locked` tinyint(1) NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
UNIQUE KEY `Name` (`name`) USING BTREE
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=2285 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `track` (
|
||||||
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`uri` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`name` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`album` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`year` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||||
|
`length` mediumint(8) unsigned NOT NULL,
|
||||||
|
`image` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||||
|
`locked` tinyint(1) unsigned NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
UNIQUE KEY `URI` (`uri`) USING BTREE,
|
||||||
|
KEY `Name` (`name`)
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=3570 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `playback` (
|
||||||
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`track_id` int(10) unsigned NOT NULL,
|
||||||
|
`timestamp` bigint(20) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
KEY `FK_playback_track` (`track_id`),
|
||||||
|
KEY `Time` (`timestamp`),
|
||||||
|
CONSTRAINT `FK_playback_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=227 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `playlist` (
|
||||||
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`uri` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
UNIQUE KEY `Schlüssel 2` (`name`),
|
||||||
|
KEY `Schlüssel 3` (`uri`)
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `playlist_track` (
|
||||||
|
`playlist_id` int(10) unsigned NOT NULL,
|
||||||
|
`track_id` int(10) unsigned NOT NULL,
|
||||||
|
`position` int(10) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`playlist_id`,`track_id`),
|
||||||
|
KEY `FK_playlist_track_track` (`track_id`),
|
||||||
|
KEY `FK_playlist_track_playlist` (`playlist_id`),
|
||||||
|
CONSTRAINT `FK_playlist_track_playlist` FOREIGN KEY (`playlist_id`) REFERENCES `playlist` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||||
|
CONSTRAINT `FK_playlist_track_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `search_term` (
|
||||||
|
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`term` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`first_search` bigint(20) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
UNIQUE KEY `Schlüssel 2` (`term`) USING BTREE
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=88 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `search_term_track` (
|
||||||
|
`search_term_id` int(10) unsigned NOT NULL,
|
||||||
|
`track_id` int(10) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`search_term_id`,`track_id`),
|
||||||
|
KEY `FK_search_term_tracks_track` (`track_id`),
|
||||||
|
CONSTRAINT `FK_search_term_tracks_search_term` FOREIGN KEY (`search_term_id`) REFERENCES `search_term` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||||
|
CONSTRAINT `FK_search_term_tracks_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `session` (
|
||||||
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`image` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||||
|
`last_seen` bigint(20) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
UNIQUE KEY `Schlüssel 2` (`name`) USING BTREE
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `setting` (
|
||||||
|
`key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
`value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||||
|
PRIMARY KEY (`key`)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `track_artist` (
|
||||||
|
`track_id` int(10) unsigned NOT NULL,
|
||||||
|
`artist_id` int(10) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`artist_id`,`track_id`),
|
||||||
|
KEY `FK__track` (`track_id`),
|
||||||
|
KEY `FK__artist` (`artist_id`),
|
||||||
|
CONSTRAINT `FK__artist` FOREIGN KEY (`artist_id`) REFERENCES `artist` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||||
|
CONSTRAINT `FK__track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `vote` (
|
||||||
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`track_id` int(10) unsigned NOT NULL,
|
||||||
|
`session_id` int(10) unsigned DEFAULT NULL,
|
||||||
|
`timestamp` bigint(20) unsigned NOT NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
KEY `FK_vote_track` (`track_id`),
|
||||||
|
KEY `FK_vote_session` (`session_id`),
|
||||||
|
CONSTRAINT `FK_vote_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=319 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
utoy:
|
utoy:
|
||||||
image: git.pbrinkmeier.de/paul/utoy:0.6
|
image: git.pbrinkmeier.de/paul/utoy:0.6.3
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
services:
|
services:
|
||||||
vrnp:
|
vrnp:
|
||||||
image: git.pbrinkmeier.de/paul/vrnp:0.0.3
|
image: git.pbrinkmeier.de/paul/vrnp:0.0.10
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
VRNP_PASSWORD: "${VRNP_PASSWORD}"
|
VRNP_PASSWORD: "${VRNP_PASSWORD}"
|
||||||
|
VRNP_CLIENT_ALLOWLIST: "VAG"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
services:
|
||||||
|
yore:
|
||||||
|
image: git.pbrinkmeier.de/paul/yore:0.0.12
|
||||||
|
restart: always
|
||||||
|
environment:
|
||||||
|
# For dbmate (migrations)
|
||||||
|
DATABASE_URL: "postgres://yore:${YORE_DB_PASSWORD}@yore_db/yore-db?sslmode=disable&search_path=public"
|
||||||
|
# For yore itself
|
||||||
|
YORE_DB: "host=yore_db dbname=yore-db user=yore password=${YORE_DB_PASSWORD}"
|
||||||
|
YORE_DOWNLOAD_DIR: /data/downloads
|
||||||
|
YORE_DBMATE_DIR: /data/dbmate
|
||||||
|
user: 42004:42004
|
||||||
|
volumes:
|
||||||
|
- /etc/passwd:/etc/passwd:ro
|
||||||
|
- /etc/group:/etc/group:ro
|
||||||
|
- /etc/timezone:/etc/timezone:ro
|
||||||
|
- /etc/localtime:/etc/localtime:ro
|
||||||
|
- /var/lib/pbri/docker/yore_data:/data
|
||||||
|
|
||||||
|
yore_db:
|
||||||
|
image: postgres:17-alpine
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: yore-db
|
||||||
|
POSTGRES_USER: yore
|
||||||
|
POSTGRES_PASSWORD: "${YORE_DB_PASSWORD}"
|
||||||
|
volumes:
|
||||||
|
- /var/lib/pbri/docker/yore_db:/var/lib/postgresql/data
|
||||||
|
|
||||||
|
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
|
name: caddy-network
|
||||||
|
external: true
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
services:
|
||||||
|
zomboid:
|
||||||
|
image: renegademaster/zomboid-dedicated-server:2.5.0
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- /var/lib/pbri/docker/zomboid_dedicated_server:/home/steam/ZomboidDedicatedServer
|
||||||
|
- /var/lib/pbri/docker/zomboid_config:/home/steam/Zomboid
|
||||||
|
ports:
|
||||||
|
- "16261:16261/udp"
|
||||||
|
- "16262:16262/udp"
|
||||||
|
environment:
|
||||||
|
ADMIN_USERNAME: "the_gwiddy"
|
||||||
|
ADMIN_PASSWORD: "${ZOMBOID_ADMIN_PASSWORD}"
|
||||||
|
SERVER_NAME: "server3"
|
||||||
|
SERVER_PASSWORD: "${ZOMBOID_SERVER_PASSWORD}"
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
|
36363035616130303139633735336435323835383564386238336334366462666535326335636237
|
||||||
|
3362343830383135633564666337383866653531383762370a333366646136336436346166326139
|
||||||
|
65633935626565393264623066316262656261623435363563383961333462643165303937393262
|
||||||
|
3036316461313138350a316465376133313233653762363235383864626238343539333939333832
|
||||||
|
33313162343061376161626562323338613662336133633963366335373532653332623334313162
|
||||||
|
35316366313939336239646633343430646331373263623033383761306462343733623866313632
|
||||||
|
30323030313437386133383231613236663762333862376137366238623236306330623739653563
|
||||||
|
65623930646466616638616337343830643934323836623761633361323836333461386234313535
|
||||||
|
62313065623337366461376665323833326239303539363961396366343736623930333637613835
|
||||||
|
37623639643730373132363034326565346234643239333266356236623264663263336637396662
|
||||||
|
32353437386333313465313738616663343161663362663736663664623034316534313331653030
|
||||||
|
37353432663733383363353462313032363634396133623730393661646536336532663237646230
|
||||||
|
37316136383139323134373837373437393961373633653230323062336666313963656563366436
|
||||||
|
30313338333665626264343537626366653433306239646264326630353637646630653039363833
|
||||||
|
61343732313530633831316236383632616461333662356262623830373231383939613962363862
|
||||||
|
37616438373761633631383036343135313166323439333331336234343662663163393032343939
|
||||||
|
34663734336639653332653538306565323061623963373863613130636466613231326137316635
|
||||||
|
31373765306161366265353030323261306663316633356434356137303237343936376330356136
|
||||||
|
63303335333139326562363461346437626638366135383836636634303564393433303265303133
|
||||||
|
35633432396638636637396365626131623364373061616164323831656366306165383236333761
|
||||||
|
34646635316334333161663639396463633262663933616633633436666638656338623732653264
|
||||||
|
64656637313436616266373833643763333662376162363437363138326263316366316163323331
|
||||||
|
65656662396630303634653931666136356361626332363532643635666263313737336666313131
|
||||||
|
34623163636261386361393732353863656531343265623361633736613834313236336232656534
|
||||||
|
33316162653531333733313438333536396461323263353031393039383161376338666466643562
|
||||||
|
64653031623263353332613536613932393762313132343864366566373433613932653637353365
|
||||||
|
38393262613562613931313236643564313334306561376436653931303264633635336465376630
|
||||||
|
36653466333063663962633664656338663466643632336561303364636266306437666165633665
|
||||||
|
65343439353238396139653663346338393630356331653132623639666337363139663163633235
|
||||||
|
66663836643531303838656163646134393337663230636634306464323539313430333131386261
|
||||||
|
66393639393338386337613361313366303462616535623230643161323663666139623461303862
|
||||||
|
65356430383564343535373764616666646638363635616236666131613462346562376435616466
|
||||||
|
61363134363130306464316232306333353134333366396436646530306666626336663265386530
|
||||||
|
30353763393565313139313838353433613637373066626130623163643637613064633166623063
|
||||||
|
63336132623935643534656362643764666661323733656664323861663835323562656162376639
|
||||||
|
30663237636537656364636139376236306265633461333132633332636536636566393130383266
|
||||||
|
61323435303431393462646536326634316634636133353037663765616433663138656666376538
|
||||||
|
39356130623332363363393662613931393535366534636130633366633136383335303535336661
|
||||||
|
36326633643530656439346637363033623431386139363731333132323330613563313337646538
|
||||||
|
34376139643935663139313439383435323939353139396433613439376234636463313633626362
|
||||||
|
63343762613530353536303138666430326637643861333431656436646436326462306434613033
|
||||||
|
39643232633461353131663632303461633762363164373961356161396161636430343363363039
|
||||||
|
35333639363661623832646535363765353638343963346464616562653362363166646264393964
|
||||||
|
63643538303937316132653235323961363663356137306562336632613638643865323636373731
|
||||||
|
33636632366132363431396139343931363833303434353832653030373637633936326433323431
|
||||||
|
63393639316466356435626466323963313839363830356537646232613138343134656262636435
|
||||||
|
61663766623038633133383162646163633435666631303232346531363531663333646234333564
|
||||||
|
61666366643363303765663838666439313537383463316433333061383962363537376661613064
|
||||||
|
61306138623765633637613833313537373038366238313066646564646362646135333364663036
|
||||||
|
63623861616534393936653537353435633562373939633039306236376263376631643965333133
|
||||||
|
61353934386161636537383434626465613533333464643766613662643030656232383365643661
|
||||||
|
35303435326335316431626135643531653865646235323565626661393535363034333562393666
|
||||||
|
61333031653336333264653536356364663565323937346439653536303662613235376231396537
|
||||||
|
65343931353061326437376463383839333731653766333435626566613133393732316666343837
|
||||||
|
32373733643332376635386338353531306564633735343638383036356638336539346131623862
|
||||||
|
38356636393634383162646463313062306363666434303737306333636539356361343261626133
|
||||||
|
66386239663338613561386239626234303831313433353065306264306665323636393434326132
|
||||||
|
37343266383062616337333265386633646664633866316337306435343732616538323761646130
|
||||||
|
64333531343266663066623132333866613362646163396539386536306266393162373564633830
|
||||||
|
61623365356666353033393661626337633031636135383063316436623333623837323461656437
|
||||||
|
62626333613738386562306232613631643239326437316639643362623666306566303564336132
|
||||||
|
64643161313130626163343630363531363936313962663361613131633763353739363536323263
|
||||||
|
65303262346531323339326431306564633665616566373235663430306139343364366436326363
|
||||||
|
38633862363837623361633239616537316336643335633732336433666662336139333036393339
|
||||||
|
32373233306161616632383266656133363937646235373132643731636631353233376336616663
|
||||||
|
61643236386535663737613138393134393866383736373566653836633564386261613365646566
|
||||||
|
37626633326131323837613530303935326663666333386439613334616666663166383063393063
|
||||||
|
37386364653265643036653964303731373335656662396363363032643963333239353336633565
|
||||||
|
63376632376635383132383733656532383639623161343766343966333937646162303334643634
|
||||||
|
66646237396633636333613638636566373364626230383438306334626636393261323130636635
|
||||||
|
63613136353638303264313366373965653735623962636164303062383663653631613038613839
|
||||||
|
64323438643965623035646166363932393835626365616166653838656537616334653633376564
|
||||||
|
38353265343637616364386164396465356664346534653633623337343434636435353931663037
|
||||||
|
38383233633463393833396665323536336661653732303033363035323839333565383631333164
|
||||||
|
35383432646436343637336130393461613434613136636336636162613763656333393134316430
|
||||||
|
66656561313331623131666434626132643863303562366332663232346333363835336137663831
|
||||||
|
32643436616431373730316163346133663434313738633439306638613561373064636566343236
|
||||||
|
65653637666535376339636565623163663365383262666336343963316461333962633030393139
|
||||||
|
33633735393034633332663565373032313962636532383462633334316431636439393133373464
|
||||||
|
34663831333438333663336631373763396634336361313834616239663366663865613334343438
|
||||||
|
32633065643536316338393237663237643434666339343136663135626339323235366134663330
|
||||||
|
66313732643633646630333965613061313337613936356335316134623162353736646638636137
|
||||||
|
35326361383465646362313765613762373963613836346332313134613336336362346662343731
|
||||||
|
31396163396566373863336363313632636336343939643333326431303366643532313830306666
|
||||||
|
62663037643137333066383164386436656564333439643932343061643137323535343564666164
|
||||||
|
65356530633463386132636136633463646361643830653364363132316565353138366164373935
|
||||||
|
36393566666537656637633566613438663563653564343136306263306263333439386262326633
|
||||||
|
62343230306130323236613331623466396164663234653133626231396566336231623632363463
|
||||||
|
32376663303564313230343738303234323430323436633335333962396661353333636162333635
|
||||||
|
39633835333033336461643166313538326434633264653131643365386439313963346336396466
|
||||||
|
37303763633331383336313336316266373739396335656466313332386535666561626332376234
|
||||||
|
37653361363465616363333134326638393438323063613163356230393866626664386461343136
|
||||||
|
39306263653633643036383934326139303434363437373061376561313161373033643537626162
|
||||||
|
38653965333135653039323966376430323462353561633732643737303366316461373035383437
|
||||||
|
61633362393566383034616238613262613762323861303663623665623636353637313633653666
|
||||||
|
30376330366438396362356330343537346136366361613133643435643736363334393166623863
|
||||||
|
3762
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
|
33633161386465383663373137623030626264653862373161353564343662346433376437353530
|
||||||
|
6265356266663464613439663434373531333939326538330a313064343637366632633866343534
|
||||||
|
38313234303830636364383361613538666338636333323262333438313134353134356635626239
|
||||||
|
6366336439353266660a633161383062666130396566396431383534313266343431633064376463
|
||||||
|
38623562656564363565346166396363303636323062336636313838653638663833
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
|
39313233623136333531343838643537373064363466356664326339323237623032303436613735
|
||||||
|
6233383831383339366365663931333837313161646263390a646237306331386263323031373164
|
||||||
|
33383365643735343834643839356238646161613330353938643738636135653562646430303330
|
||||||
|
3332306436613537370a653234353464646639366236623665623162643363353230643963636361
|
||||||
|
65386363623336396664333237313066383764656438363233653831623238623062333064343263
|
||||||
|
36336132393563333031656366313066383132663732313964376261656331613863393965393232
|
||||||
|
66383031366564313636643363653239663537616537623263383135326464376330636333303736
|
||||||
|
32316530316139323264353136633865373634323761653763326262383238396639646664653039
|
||||||
|
31376639346138343635343937613061623261666465323332313361363064393035663038346231
|
||||||
|
3734333734656334626265643030303634383864613536373934
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
|
62303232383236386431613965343261333235646564616235643363393462646166613531303230
|
||||||
|
6361343030396633663262333363616538323230313733620a306237396132663064316633323937
|
||||||
|
62313339383336613066653662663066323330396234303435373137326435343637623465366133
|
||||||
|
3534643534396639640a373834656135393733373465663138316564383662613561353065613861
|
||||||
|
62643438383165316132333737623038336132666264353531633965663032333165666630626633
|
||||||
|
65643632616363343938643138353238636231383134383733656466346531626634346163626434
|
||||||
|
32383065316231363737663463663562373031313965346363336134653536663365613264383261
|
||||||
|
61616434383537666334663166393536376634386231343030343465393837326439363465633064
|
||||||
|
62643661643063316465623034646566363962353431623430356432366461613835633133663663
|
||||||
|
35663836383830616161656265316463396335326330623439383935323039366136366232303235
|
||||||
|
38323262316432343762663865333036313137396235396530656632366531303535626364363666
|
||||||
|
32613030346636646136636532653134616639396237643866356464363138633863363061656534
|
||||||
|
34646431393238386166306239666331376166316635333361616464396363626635343963306663
|
||||||
|
30363930366332343934613830396464633534653565306138613066383933346633323337656264
|
||||||
|
62636337326266633162356363373430626433653837346330653338306530356261383462336261
|
||||||
|
65333364656263623335653937386439326164623838613463613031323037383762343165363230
|
||||||
|
38343366346130383632316234656166313935336464666530373939333063356461303139643033
|
||||||
|
38636133313037613431663161383836653137653964393866346564663339363764643535333037
|
||||||
|
36616337666636653835313334373164666165313066366163373739393462653362306135396538
|
||||||
|
66303636623535353231373839383539613165353463643961643130666563633465353534623931
|
||||||
|
31343039313336323932373230643137323432313737396538353834376639353235306332353334
|
||||||
|
65303231623138386237383437383234366461356464343236396631303234353566346534326665
|
||||||
|
34316436326335333737633463386635356432326162346463646665643034626339643161383938
|
||||||
|
63363531393131363464643232376232363639306564656463323162316362343233376663633662
|
||||||
|
31333164316565383436326461316533386536623062373531323037373033373265333437393836
|
||||||
|
36613530303163393931363666613865616566626533356131613239626162633236643635613938
|
||||||
|
30393362316461396532393261643464376365643337633233323666336135366535653536386130
|
||||||
|
35623564626135303232656337313430346136376361376232343166663232353763376464376230
|
||||||
|
39356565373364353635386630333238616263306639663963616662633137343965
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
|
36313063633538313631386664353535373166306563613830316430613035306438326564396331
|
||||||
|
6336306566306166616266643630343262616465306631350a393932613665346164613361333037
|
||||||
|
39386135396364666630623962653462623234386430383034353731353361663837343036393130
|
||||||
|
3261633964626135610a626364363761373734333762373764366363643537316662643634616263
|
||||||
|
32383730663230303064626130393164616237636362656331313333316439323135366535303334
|
||||||
|
3436323333383739666261656531363335326532616562353166
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
|
35336632386231333233333633656163356564316637366438383532626437303364633733353436
|
||||||
|
3836376461393761653637666532643264613864633935620a326365386634393935333433306564
|
||||||
|
62346235346262313339633739353232663562623562616136623838386233633136383764666536
|
||||||
|
6239663264643333370a393762636231343034643133613163626239353735363037646638633933
|
||||||
|
62376165306438653537343564376536396537666534633330666163346533313434616561306434
|
||||||
|
63313035643732303863663430303936346264626637623936343763303738623865356536306365
|
||||||
|
32623164323738663065613332656465643536633933643731366139626165636230343966383839
|
||||||
|
64343961316139313931313966356430343438376461366537356337363835623637306539646265
|
||||||
|
32376562363061643630663937663064393664663766613365363439653030393239
|
||||||
Generated
+3
-3
@@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737753628,
|
"lastModified": 1779042148,
|
||||||
"narHash": "sha256-vwRbCpftG6/QrBeu3eQO1l5wzAg/pAMdvGOOLeXWeM4=",
|
"narHash": "sha256-0/iVMQ31Zna06KJselli3hFuGy4HKacyJ8UxmWMrNZI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f22b0184bd0f4bb3061580b1e807feb68a85d90d",
|
"rev": "3ef9dc56727d66ad28c2c3608da7261391ca18ad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
Reference in New Issue
Block a user