diff --git a/infrastructure/caddy/docker-compose.caddy.yml b/infrastructure/caddy/docker-compose.caddy.yml index 186a00d..71ccfd2 100644 --- a/infrastructure/caddy/docker-compose.caddy.yml +++ b/infrastructure/caddy/docker-compose.caddy.yml @@ -5,6 +5,7 @@ services: container_name: caddy profiles: - caddy + #user: ${PUID:-1000}:${PGID:-1000} depends_on: main_infrastructure: condition: service_completed_successfully @@ -21,6 +22,7 @@ services: - infra-network env_file: - ./caddy/env/caddy.env + #read_only: true security_opt: - no-new-privileges:true #cap_drop: @@ -40,12 +42,14 @@ services: - caddy depends_on: - caddy + #user: "${PUID:-1000}:${PGID:-1000}" restart: on-failure:5 env_file: - ./caddy/env/caddy_backup.env volumes: - caddy_backup:/mnt/restic - caddy_data:/data:ro + # - caddy_backup_cache:/.cache networks: - infra-network security_opt: @@ -58,3 +62,6 @@ volumes: name: caddy_config caddy_backup: name: caddy_backup + caddy_backup_cache: + name: caddy_backup_cache + diff --git a/infrastructure/main/docker-compose.main.yml b/infrastructure/main/docker-compose.main.yml index 6b01013..098d6ed 100644 --- a/infrastructure/main/docker-compose.main.yml +++ b/infrastructure/main/docker-compose.main.yml @@ -8,6 +8,10 @@ services: - infrastructure_server_chown:/infrastructure_server:rw - public_data:/infrastructure_server/public:rw - private_data:/infrastructure_server/private:rw + #- caddy_data:/infrastructure_server/caddy_data:rw + #- caddy_config:/infrastructure_server/caddy_config:rw + #- caddy_backup:/infrastructure_server/caddy_backup:rw + #- caddy_backup_cache:/infrastructure_server/caddy_backup_cache:rw read_only: true security_opt: - no-new-privileges:true @@ -26,6 +30,14 @@ volumes: name: public_data private_data: name: private_data + caddy_data: + name: caddy_data + caddy_config: + name: caddy_config + caddy_backup: + name: caddy_backup + caddy_backup_cache: + name: caddy_backup_cache networks: infra-network: diff --git a/infrastructure/openssh/docker-compose.openssh.yml b/infrastructure/openssh/docker-compose.openssh.yml index 2cb98a7..598c305 100644 --- a/infrastructure/openssh/docker-compose.openssh.yml +++ b/infrastructure/openssh/docker-compose.openssh.yml @@ -15,9 +15,13 @@ services: - PGID=${PGID:-1000} volumes: - openssh_config:/config + - ./openssh/config/authorized_keys:/authorized_ssh_keys:ro - public_data:/public - private_data:/private - - ./openssh/config/authorized_keys:/authorized_ssh_keys:ro + - caddy_data:/caddy_data:rw + - caddy_config:/caddy_config:rw + - caddy_backup:/caddy_backup:rw + - caddy_backup_cache:/caddy_backup_cache:rw networks: - infra-network security_opt: @@ -31,3 +35,12 @@ volumes: name: public_data private_data: name: private_data + caddy_data: + name: caddy_data + caddy_config: + name: caddy_config + caddy_backup: + name: caddy_backup + caddy_backup_cache: + name: caddy_backup_cache +