ghoscht/nix-config
ghoscht/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: ghoscht:528246061aa0eba2bcb35bb7ff146f89ba55c854
Branches Tags
ghoscht:main
ghoscht:structural-rework
ghoscht:old-structure
..
compare: ghoscht:5b3d999a863872fb34d8ecebee00a156c47e0e25
Branches Tags
ghoscht:main
ghoscht:structural-rework
ghoscht:old-structure

No commits in common. "528246061aa0eba2bcb35bb7ff146f89ba55c854" and "5b3d999a863872fb34d8ecebee00a156c47e0e25" have entirely different histories.
528246061a ... 5b3d999a86

10 changed files with 27 additions and 32 deletions
Show stats Expand all files Collapse all files

2
hosts/franz/arion/auth/arion-compose.nix
View file

@ -1,5 +1,5 @@
let let
authentikImage = "ghcr.io/goauthentik/server:2024.10.2"; authentikImage = "ghcr.io/goauthentik/server:2024.8.2";
in { in {
project.name = "auth"; project.name = "auth";

2
hosts/franz/arion/default.nix
View file

@ -21,7 +21,7 @@
./headscale ./headscale
./auth ./auth
./minio ./minio
./stats # ./stats
./wiki ./wiki
]; ];

2
hosts/franz/arion/git/arion-compose.nix
View file

@ -10,7 +10,7 @@
services = { services = {
forgejo.service = { forgejo.service = {
image = "codeberg.org/forgejo/forgejo:9.0.2"; image = "codeberg.org/forgejo/forgejo:8.0.3";
container_name = "forgejo"; container_name = "forgejo";
useHostStore = true; useHostStore = true;
labels = { labels = {

2
hosts/franz/arion/infrastructure/arion-compose.nix
View file

@ -58,7 +58,7 @@
container_name = "crowdsec"; container_name = "crowdsec";
environment = { environment = {
GID = "1000"; GID = "1000";
COLLECTIONS = "crowdsecurity/linux crowdsecurity/traefik firix/authentik LePresidente/gitea Dominic-Wagner/vaultwarden crowdsecurity/appsec-generic-rules crowdsecurity/appsec-virtual-patching"; COLLECTIONS = "crowdsecurity/linux crowdsecurity/traefik firix/authentik LePresidente/gitea Dominic-Wagner/vaultwarden";
}; };
volumes = [ volumes = [
"/home/ghoscht/.docker/infrastructure/crowdsec_config/acquis.yaml:/etc/crowdsec/acquis.yaml" "/home/ghoscht/.docker/infrastructure/crowdsec_config/acquis.yaml:/etc/crowdsec/acquis.yaml"

12
hosts/franz/arion/matrix/arion-compose.nix
View file

@ -10,7 +10,7 @@
services = { services = {
synapse.service = { synapse.service = {
image = "matrixdotorg/synapse:v1.118.0"; image = "matrixdotorg/synapse:v1.113.0";
container_name = "synapse"; container_name = "synapse";
labels = { labels = {
"traefik.enable" = "true"; "traefik.enable" = "true";
@ -31,7 +31,7 @@
"traefik.http.routers.synapse-external.tls.certresolver" = "letsencrypt"; "traefik.http.routers.synapse-external.tls.certresolver" = "letsencrypt";
}; };
volumes = [ volumes = [
"/storage/dataset/docker/matrix/synapse_data:/data" "/home/ghoscht/.docker/matrix/synapse_data:/data"
]; ];
env_file = [ env_file = [
"/home/ghoscht/.docker/matrix/synapse.env" "/home/ghoscht/.docker/matrix/synapse.env"
@ -53,7 +53,7 @@
"/home/ghoscht/.docker/matrix/synapse.env" "/home/ghoscht/.docker/matrix/synapse.env"
]; ];
volumes = [ volumes = [
"/storage/dataset/docker/matrix/synapse_db:/var/lib/postgresql/data" "/home/ghoscht/.docker/matrix/synapse_db:/var/lib/postgresql/data"
]; ];
restart = "unless-stopped"; restart = "unless-stopped";
networks = [ networks = [
@ -64,8 +64,8 @@
container_name = "matrix-nginx"; container_name = "matrix-nginx";
image = "nginx:1.25.4"; image = "nginx:1.25.4";
volumes = [ volumes = [
"/storage/dataset/docker/matrix/nginx_data/matrix.conf:/etc/nginx/conf.d/matrix.conf" "/home/ghoscht/.docker/matrix/nginx_data/matrix.conf:/etc/nginx/conf.d/matrix.conf"
"/storage/dataset/docker/matrix/nginx_data/www:/var/www/" "/home/ghoscht/.docker/matrix/nginx_data/www:/var/www/"
]; ];
labels = { labels = {
"traefik.enable" = "true"; "traefik.enable" = "true";
@ -94,7 +94,7 @@
element.service = { element.service = {
image = "vectorim/element-web:v1.11.64"; image = "vectorim/element-web:v1.11.64";
volumes = [ volumes = [
"/storage/dataset/docker/matrix/element_data/element-config.json:/app/config.json" "/home/ghoscht/.docker/matrix/element_data/element-config.json:/app/config.json"
]; ];
labels = { labels = {
"traefik.enable" = "true"; "traefik.enable" = "true";

2
hosts/franz/arion/passwords/arion-compose.nix
View file

@ -8,7 +8,7 @@
services = { services = {
vaultwarden.service = { vaultwarden.service = {
image = "vaultwarden/server:1.32.5"; image = "vaultwarden/server:1.32.4";
container_name = "vaultwarden"; container_name = "vaultwarden";
labels = { labels = {
"traefik.enable" = "true"; "traefik.enable" = "true";

4
hosts/franz/arion/push/arion-compose.nix
View file

@ -31,8 +31,8 @@
"traefik.http.routers.ntfy-external.tls.certresolver" = "letsencrypt"; "traefik.http.routers.ntfy-external.tls.certresolver" = "letsencrypt";
}; };
volumes = [ volumes = [
"/home/ghoscht/.docker/push/ntfy_config/server.yml:/etc/ntfy/server.yml" "/home/ghoscht/.docker/push/ntfy_data/server.yml:/etc/ntfy/server.yml"
"/home/ghoscht/.docker/push/ntfy_data:/etc/ntfy/data" "/storage/dataset/docker/push/ntfy_data:/etc/ntfy/data"
]; ];
environment = { environment = {
TZ = "Europe/Berlin"; TZ = "Europe/Berlin";

1
hosts/franz/arion/stats/arion-compose.nix
View file

@ -63,7 +63,6 @@
image = "grafana/promtail:3.0.0"; image = "grafana/promtail:3.0.0";
volumes = [ volumes = [
"/var/log:/var/log" "/var/log:/var/log"
"/var/run/docker.sock:/var/run/docker.sock:ro"
"/home/ghoscht/.docker/stats/promtail_data/promtail-config.yml:/etc/promtail/promtail-config.yml" "/home/ghoscht/.docker/stats/promtail_data/promtail-config.yml:/etc/promtail/promtail-config.yml"
]; ];
command = "-config.file=/etc/promtail/promtail-config.yml"; command = "-config.file=/etc/promtail/promtail-config.yml";

32
hosts/franz/restic.nix
View file

@ -46,6 +46,9 @@ in {
sops.secrets."autorestic/zfs_key" = { sops.secrets."autorestic/zfs_key" = {
owner = vars.user; owner = vars.user;
}; };
sops.secrets."autorestic/ssd_key" = {
owner = vars.user;
};
sops.secrets."autorestic/eustachius_key" = { sops.secrets."autorestic/eustachius_key" = {
owner = vars.user; owner = vars.user;
}; };
@ -170,6 +173,7 @@ in {
from: /home/ghoscht/.docker/passwords from: /home/ghoscht/.docker/passwords
to: to:
- zfs - zfs
# - ssd
- eustachius - eustachius
cron: '0 4 * * *' # Every Day at 4:00 cron: '0 4 * * *' # Every Day at 4:00
hooks: hooks:
@ -178,31 +182,19 @@ in {
- arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix stop - arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix stop
after: after:
- arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix start - arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix start
push: matrix:
from: /storage/dataset/docker/push/ from: /home/ghoscht/.docker/matrix
to: to:
- zfs - zfs
- eustachius - eustachius
cron: '0 4 * * *' # Every Day at 4:00 forget: prune
cron: '0 4 * * 0' # Every Sunday at 4:00
hooks: hooks:
<<: *default_hooks <<: *default_hooks
before: before:
- arion -f ${arionPath}/push/arion-compose.nix -p ${arionPath}/push/arion-pkgs.nix stop - arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix stop
after: after:
- arion -f ${arionPath}/push/arion-compose.nix -p ${arionPath}/push/arion-pkgs.nix start - arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix start
# matrix:
# from: /home/ghoscht/.docker/matrix
# to:
# - zfs
# - eustachius
# forget: prune
# cron: '0 4 * * 0' # Every Sunday at 4:00
# hooks:
# <<: *default_hooks
# before:
# - arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix stop
# after:
# - arion -f ${arionPath}/matrix/arion-compose.nix -p ${arionPath}/matrix/arion-pkgs.nix start
music: music:
from: /storage/dataset/data/media/music from: /storage/dataset/data/media/music
to: to:
@ -307,6 +299,10 @@ in {
type: local type: local
path: /storage/dataset/backups path: /storage/dataset/backups
key: '${config.sops.placeholder."autorestic/zfs_key"}' key: '${config.sops.placeholder."autorestic/zfs_key"}'
# ssd:
# type: local
# path: /home/ghoscht/Backups
# key: '${config.sops.placeholder."autorestic/ssd_key"}'
eustachius: eustachius:
type: rest type: rest
path: http://100.64.0.3:8000/franz path: http://100.64.0.3:8000/franz

0
rsc/docker/franz/push/ntfy_config/server.yml → rsc/docker/franz/push/ntfy_data/server.yml
View file