Skip to content

Commit 60aa32b

Browse files
michaelhodgesMichael Hcrypt0rr
authored
Refactor Templates (#260)
* compose.yml and .env added to paperless service. * Include paperless service README * Error paperless service README * Add PUID, GUID to environment. Align environment variables with template format * Remove volumes and incorporate the local storage principle as outlined in templates. * Restored comments. * Place TZ in .env * Add TZ variable to environment. * Revert "Restored comments." This reverts commit 216de08. * Restore Comments * Revert * Revert changes made to template files. * Set SERVICEPORT to 80 in .env configuration * Update to include paperless-ngx * Update README with Tailscale service configuration Added information about Tailscale integration for secure networking. * Move TZ environment variable to .env file * Update .env * Area to declare container environment variables. * Timezone * Update time zone configuration across multiple services to use environment variable - Added TZ environment variable definition in .env files for services that did not have it. --------- Co-authored-by: Michael H <michael@hplaptop.local> Co-authored-by: Bart <57799908+crypt0rr@users.noreply.github.com>
1 parent fc99136 commit 60aa32b

File tree

166 files changed

+419
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+419
-111
lines changed

services/actual-budget/.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ DNS_SERVER=9.9.9.9 # Preferred DNS server for Tailscale. Uncomment the "dns:" se
1313
# Tailscale Configuration
1414
TS_AUTHKEY= # Auth key from https://tailscale.com/admin/authkeys. See: https://tailscale.com/kb/1085/auth-keys#generate-an-auth-key for instructions.
1515

16+
# Time Zone setting for containers
17+
TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
18+
1619
# Optional Service variables
1720
# PUID=1000

services/actual-budget/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ services:
5555
environment:
5656
- PUID=1000
5757
- PGID=1000
58-
- TZ=Europe/Amsterdam
58+
- TZ=${TZ}
5959
# Uncomment any of the lines below to set configuration options.
6060
# - ACTUAL_HTTPS_KEY=/data/selfhost.key
6161
# - ACTUAL_HTTPS_CERT=/data/selfhost.crt

services/adguardhome-sync/.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ DNS_SERVER=9.9.9.9
1313
# Tailscale Configuration
1414
TS_AUTHKEY=
1515

16+
# Time Zone setting for containers
17+
TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
18+
1619
# Optional Service variables
1720
# PUID=1000

services/adguardhome-sync/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ services:
4242
container_name: app-${SERVICE} # Name for local container management
4343
command: run
4444
environment:
45-
- TZ=Europe/Amsterdam
45+
- TZ=${TZ}
4646
# Origin AdGuardHome
4747
- ORIGIN_URL=http://192.168.1.1:3000 #Your origin Adguard Home instance -> change as necessary
4848
- ORIGIN_USERNAME=username #change as necessary

services/adguardhome/.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ DNS_SERVER=9.9.9.9
1313
# Tailscale Configuration
1414
TS_AUTHKEY=
1515

16+
# Time Zone setting for containers
17+
TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
18+
1619
# Optional Service variables
1720
# PUID=1000

services/adguardhome/compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ services:
5454
network_mode: service:tailscale # Sidecar configuration to route ${SERVICE} through Tailscale
5555
container_name: app-${SERVICE} # Name for local container management
5656
environment:
57-
- TZ=Europe/Amsterdam
57+
- TZ=${TZ}
5858
volumes:
5959
- ./${SERVICE}-data/workdir:/opt/adguardhome/work # Work directory for Adguard Home - you may need to change the path
6060
- ./${SERVICE}-data/configdir:/opt/adguardhome/conf # Config directory for Adguard Home - you may need to change the path
@@ -67,4 +67,4 @@ services:
6767
timeout: 10s # Time to wait for the check to succeed
6868
retries: 3 # Number of retries before marking as unhealthy
6969
start_period: 30s # Time to wait before starting health checks
70-
restart: always
70+
restart: always

services/anchor/.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ DNS_SERVER=9.9.9.9 # Preferred DNS server for Tailscale. Uncomment the "dns:" se
1313
# Tailscale Configuration
1414
TS_AUTHKEY= # Auth key from https://tailscale.com/admin/authkeys. See: https://tailscale.com/kb/1085/auth-keys#generate-an-auth-key for instructions.
1515

16+
# Time Zone setting for containers
17+
TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
18+
1619
# Optional Service variables
1720
# PUID=1000

services/anchor/compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ services:
5555
environment:
5656
- PUID=1000
5757
- PGID=1000
58-
- TZ=Europe/Amsterdam
58+
- TZ=${TZ}
5959
volumes:
6060
- ./${SERVICE}-data:/data
6161
depends_on:
@@ -67,4 +67,4 @@ services:
6767
timeout: 10s # Time to wait for the check to succeed
6868
retries: 3 # Number of retries before marking as unhealthy
6969
start_period: 30s # Time to wait before starting health checks
70-
restart: always
70+
restart: always

services/arcane/.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ DNS_SERVER=9.9.9.9 # Preferred DNS server for Tailscale. Uncomment the "dns:" se
1313
# Tailscale Configuration
1414
TS_AUTHKEY= # Auth key from https://tailscale.com/admin/authkeys. See: https://tailscale.com/kb/1085/auth-keys#generate-an-auth-key for instructions.
1515

16+
# Time Zone setting for containers
17+
TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
18+
1619
# Optional Service variables
1720
TAILNET_NAME= # for example: tail-scale

services/audiobookshelf/.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ DNS_SERVER=9.9.9.9
1313
# Tailscale Configuration
1414
TS_AUTHKEY=
1515

16+
# Time Zone setting for containers
17+
TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
18+
1619
# Optional Service variables
1720
# PUID=1000

0 commit comments

Comments
 (0)