diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 0bb0535..36a2767 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -188,7 +188,7 @@ orlop.duckdns.org { } } # local domain -odroid.local { +odroid.lan { tls internal import auth @@ -196,7 +196,7 @@ odroid.local { root . file_server browse } -xu4.local { +xu4.lan { tls internal import auth @@ -204,7 +204,7 @@ xu4.local { root * links file_server browse } -warden.local:443 { +warden.lan:443 { tls "bunce.andy@gmail.com" reverse_proxy 0.0.0.0:8882 reverse_proxy /notifications/hub 0.0.0.0:3012 diff --git a/caddy/site/links/links.json b/caddy/site/links/links.json index a6e510a..f1858c6 100644 --- a/caddy/site/links/links.json +++ b/caddy/site/links/links.json @@ -1,14 +1,14 @@ [ - {"href": "http://n2-plus.local:19999/", "text": "netdata", "port": "19999"}, - {"href": "http://n2-plus.local:9000/", "text": "portainer", "port": "9000"}, - {"href": "http://n2-plus.local:9981/", "text": "tvheadend", "port": "9981"}, - {"href": "http://n2-plus.local:8088/", "text": "tiddly", "port": "8088"}, - {"href": "http://n2-plus.local:8002/", "text": "piwigo", "port": "8002"}, - {"href": "http://n2-plus.local:3030/", "text": "fuseki", "port": "3030"}, - {"href": "http://n2-plus.local:8002/", "text": "portainer", "port": "8002"}, - {"href": "http://n2-plus.local:8443/", "text": "code-server", "port": "8443"}, - {"href": "http://n2-plus.local:8444/", "text": "code-server4", "port": "8444"}, - {"href": "http://n2-plus.local:8300/", "text": "gitea", "port": "8300"}, - {"href": "http://n2-plus.local", "text": "caddy", "port": "80"}, - {"href": "http://fish.local", "text": "fish", "port": ""} + {"href": "http://n2-plus.lan:19999/", "text": "netdata", "port": "19999"}, + {"href": "http://n2-plus.lan:9000/", "text": "portainer", "port": "9000"}, + {"href": "http://n2-plus.lan:9981/", "text": "tvheadend", "port": "9981"}, + {"href": "http://n2-plus.lan:8088/", "text": "tiddly", "port": "8088"}, + {"href": "http://n2-plus.lan:8002/", "text": "piwigo", "port": "8002"}, + {"href": "http://n2-plus.lan:3030/", "text": "fuseki", "port": "3030"}, + {"href": "http://n2-plus.lan:8002/", "text": "portainer", "port": "8002"}, + {"href": "http://n2-plus.lan:8443/", "text": "code-server", "port": "8443"}, + {"href": "http://n2-plus.lan:8444/", "text": "code-server4", "port": "8444"}, + {"href": "http://n2-plus.lan:8300/", "text": "gitea", "port": "8300"}, + {"href": "http://n2-plus.lan", "text": "caddy", "port": "80"}, + {"href": "http://fish.lan", "text": "fish", "port": ""} ] \ No newline at end of file diff --git a/lldap/compose.yaml b/lldap/compose.yaml index 3eda421..a848894 100644 --- a/lldap/compose.yaml +++ b/lldap/compose.yaml @@ -39,5 +39,5 @@ services: - LLDAP_SMTP_OPTIONS__SMTP_ENCRYPTION=STARTTLS # How the connection is encrypted, either "NONE" (no encryption, port 25), "TLS" (sometimes called SSL, port 465) or "STARTTLS" (sometimes called TLS, port 587). - LLDAP_SMTP_OPTIONS__USER=bunce.andy@gmail.com # The SMTP user, usually your email address - LLDAP_SMTP_OPTIONS__PASSWORD=vwnayldwexgyismp # The SMTP password - - LLDAP_SMTP_OPTIONS__FROM=no-reply # The header field, optional: how the sender appears in the email. The first is a free-form name, followed by an email between <>. + - LLDAP_SMTP_OPTIONS__FROM=no-reply # The header field, optional: how the sender appears in the email. The first is a free-form name, followed by an email between <>. # - LLDAP_SMTP_OPTIONS__TO=admin # Same for reply-to, optional. \ No newline at end of file diff --git a/netdata/readme.md b/netdata/readme.md index 6755421..232f185 100644 --- a/netdata/readme.md +++ b/netdata/readme.md @@ -1,2 +1,2 @@ Requires .env e.g. -HOSTNAME=omv.local \ No newline at end of file +HOSTNAME=omv.lan \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 798a18d..216a60b 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -31,4 +31,4 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_HOST=db - - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.quodatum.duckdns.org omv.local \ No newline at end of file + - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.quodatum.duckdns.org omv.lan \ No newline at end of file diff --git a/piwigo/README.md b/piwigo/README.md index c50125c..2d7b20f 100644 --- a/piwigo/README.md +++ b/piwigo/README.md @@ -21,7 +21,7 @@ ###Source ``` root@n2-plus:/mnt/media# -rsync -av root@odroid-n2.local:/mnt/drive/backups/velvet/PicasaStarter/pictures/Pictures/ pictures/ --delete +rsync -av root@odroid-n2.lan:/mnt/drive/backups/velvet/PicasaStarter/pictures/Pictures/ pictures/ --delete ``` ## Based on diff --git a/tiddlywiki/sync-quodatum.sh b/tiddlywiki/sync-quodatum.sh index 353df55..2f71328 100644 --- a/tiddlywiki/sync-quodatum.sh +++ b/tiddlywiki/sync-quodatum.sh @@ -2,4 +2,4 @@ set -e #sync from -rsync -av odroid@odroid-n2.local:/mnt/drive/tiddly/* data/ \ No newline at end of file +rsync -av odroid@odroid-n2.lan:/mnt/drive/tiddly/* data/ \ No newline at end of file diff --git a/vikunja/docker-compose.yaml b/vikunja/docker-compose.yaml index cf66a8d..6691f99 100644 --- a/vikunja/docker-compose.yaml +++ b/vikunja/docker-compose.yaml @@ -2,7 +2,7 @@ services: vikunja: image: vikunja/vikunja environment: - VIKUNJA_SERVICE_PUBLICURL: http://omv.local:3456/ + VIKUNJA_SERVICE_PUBLICURL: http://omv.lan:3456/ VIKUNJA_DATABASE_HOST: db VIKUNJA_DATABASE_PASSWORD: changeme VIKUNJA_DATABASE_TYPE: mysql diff --git a/warden/docker-compose.yml b/warden/docker-compose.yml index ad8d308..f4490a2 100644 --- a/warden/docker-compose.yml +++ b/warden/docker-compose.yml @@ -7,14 +7,14 @@ # exposed to the public facing internet to provide an additional layer # of security. This way, passwords will only sync when in the local network. # -# This configuration assumes that it will be available from https://nasty.local:86 +# This configuration assumes that it will be available from https://nasty.lan:86 # but the hostname and port can be changes freely. # Simply copy this file to the homeserver, customize the admin token and hostname # any run "docker-compose up -d" to start the containers. # # By default, self-sign up will be deisabled so no new users can simply register an # account. To create an account, you will first need to open the admin console -# at https://nasty.local:86/admin and invite the new user via their email address. +# at https://nasty.lan:86/admin and invite the new user via their email address. # Unless manually added, no SMTP server is connected and thus no mails will be sent. # You can simply now register using the email address you invited using the frontend. # @@ -35,7 +35,7 @@ services: - WEBSOCKET_ENABLED=true - ADMIN_TOKEN=myadmintoken - SIGNUPS_ALLOWED=true - - DOMAIN=https://warden.local + - DOMAIN=https://warden.lan # - SIGNUPS_ALLOWED=true # - SIGNUPS_VERIFY=true volumes: @@ -46,7 +46,7 @@ services: caddy: image: caddy:2 container_name: caddy2 - command: caddy reverse-proxy --from warden.local:86 --to vaultwarden:80 + command: caddy reverse-proxy --from warden.lan:86 --to vaultwarden:80 restart: unless-stopped ports: - 86:86 @@ -55,7 +55,7 @@ services: - ./vw-data/caddy-config:/config - ./vw-data/caddy-data:/data environment: - - DOMAIN=warden.local + - DOMAIN=warden.lan networks: - vaultwarden2