Remove unused portainer IP

bootstrap/compose.macvlan.yaml

@@ -19,5 +19,3 @@ networks:
           ip_range: ${NASCOMPOSE_MACVLAN_RANGE?}
           aux_addresses:
             nas: ${NASCOMPOSE_MACVLAN_HOST_IP?}
-    labels:
-      nas-compose.boostrap: true

compose.base.yaml

@@ -1,6 +1,9 @@
 services:
+  # All services should at least use this
   base-service:
+    # Always restart unless explicitly stopped
     restart: unless-stopped
+    # Send the logs to a Loki instance with ability to fail
     logging:
       driver: loki
       options:
@@ -10,6 +13,7 @@ services:
         loki-timeout: 1s
         keep-file: 'true'
 
+  # Service exposed via the reverse proxy
   exposed-service:
     extends: base-service
     networks:

nas-compose.env

@@ -1,23 +0,0 @@
-COMPOSE_PROFILES=ebooks,plaxt,usenet,torrents-xseed
-
-NASCOMPOSE_UID=1000
-NASCOMPOSE_GID=1000
-
-NASCOMPOSE_SERVICES=
-NASCOMPOSE_DATA=
-NASCOMPOSE_DOMAIN=
-NASCOMPOSE_LDAP_DN=
-
-NASCOMPOSE_MACVLAN_IFACE=
-NASCOMPOSE_MACVLAN_SUBNET=
-NASCOMPOSE_MACVLAN_GATEWAY=
-NASCOMPOSE_MACVLAN_RANGE=
-NASCOMPOSE_MACVLAN_HOST_IP=
-NASCOMPOSE_MACVLAN_TRAEFIK_IP=
-NASCOMPOSE_MACVLAN_PLEX_IP=
-NASCOMPOSE_MACVLAN_PORTAINER_IP=
-
-NASCOMPOSE_AUTHELIA_SMTP_ADDRESS=
-NASCOMPOSE_AUTHELIA_SMTP_USERNAME=
-
-NASCOMPOSE_DUCKDNS_DOMAIN=

nas-compose.env.template

@@ -0,0 +1,24 @@
+# Profiles to enable across the instance
+# Supported profiles:
+#   - plaxt: Plex -> Trakt Integration
+#   - ebooks: Support for ebooks and audiobooks
+#   - usenet: Support for usenet client
+#   - torrents-seeding: Support for a dedicated "seeding only" torrent client
+COMPOSE_PROFILES=ebooks,plaxt,usenet,torrents-seeding
+
+# UID and GID used in the docker containers
+NASCOMPOSE_UID=1000
+NASCOMPOSE_GID=1000
+
+# Path to the docker services folders (SSD preferable)
+NASCOMPOSE_SERVICES=
+# Path to the data folders (HDD and storage)
+NASCOMPOSE_DATA=
+# FQDN of the group of services
+NASCOMPOSE_DOMAIN=
+
+# MacVLAN dedicated IP addresses
+NASCOMPOSE_MACVLAN_HOST_IP=
+NASCOMPOSE_MACVLAN_TRAEFIK_IP=
+NASCOMPOSE_MACVLAN_PLEX_IP=
+NASCOMPOSE_MACVLAN_LOKI_IP=

reverse-proxy/compose.macvlan.yaml

@@ -4,7 +4,6 @@ services:
   traefik:
     environment:
       NASCOMPOSE_MACVLAN_SYNOLOGY_IP: ${NASCOMPOSE_MACVLAN_HOST_IP?}
-      NASCOMPOSE_MACVLAN_PORTAINER_IP: ${NASCOMPOSE_MACVLAN_PORTAINER_IP?}
     networks:
       macvlan:
         ipv4_address: ${NASCOMPOSE_MACVLAN_TRAEFIK_IP?}