From ad1f956f297dad4f13df0139aa7095c0fcdeba64 Mon Sep 17 00:00:00 2001 From: afeiszli Date: Thu, 7 Jul 2022 10:54:18 -0400 Subject: [PATCH 1/2] updating composes --- compose/docker-compose.contained.yml | 92 --------------- compose/docker-compose.coredns.yml | 12 -- compose/docker-compose.hostnetwork.yml | 89 -------------- compose/docker-compose.nocaddy.yml | 83 ------------- compose/docker-compose.nodns.yml | 83 ------------- compose/docker-compose.reference.yml | 154 ++++++++++++++++--------- compose/docker-compose.traefik.yml | 132 --------------------- compose/docker-compose.yml | 91 ++++++++++----- 8 files changed, 166 insertions(+), 570 deletions(-) delete mode 100644 compose/docker-compose.contained.yml delete mode 100644 compose/docker-compose.coredns.yml delete mode 100644 compose/docker-compose.hostnetwork.yml delete mode 100644 compose/docker-compose.nocaddy.yml delete mode 100644 compose/docker-compose.nodns.yml delete mode 100644 compose/docker-compose.traefik.yml diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml deleted file mode 100644 index 424001d5..00000000 --- a/compose/docker-compose.contained.yml +++ /dev/null @@ -1,92 +0,0 @@ -version: "3.4" - -services: - netmaker: - container_name: netmaker - image: gravitl/netmaker:v0.14.5 - volumes: - - dnsconfig:/root/config/dnsconfig - - sqldata:/root/data - - /root/certs:/etc/netmaker/ - cap_add: - - NET_ADMIN - - NET_RAW - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv6.conf.all.forwarding=1 - restart: always - environment: - SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" - SERVER_HOST: "SERVER_PUBLIC_IP" - SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443" - COREDNS_ADDR: "SERVER_PUBLIC_IP" - DNS_MODE: "on" - SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN" - API_PORT: "8081" - CLIENT_MODE: "on" - MASTER_KEY: "REPLACE_MASTER_KEY" - CORS_ALLOWED_ORIGIN: "*" - DISPLAY_KEYS: "on" - DATABASE: "sqlite" - NODE_ID: "netmaker-server-1" - MQ_HOST: "mq" - HOST_NETWORK: "off" - VERBOSITY: "1" - MANAGE_IPTABLES: "on" - PORT_FORWARD_SERVICES: "dns" - ports: - - "51821-51830:51821-51830/udp" - netmaker-ui: - container_name: netmaker-ui - depends_on: - - netmaker - image: gravitl/netmaker-ui:v0.14.5 - links: - - "netmaker:api" - environment: - BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" - restart: always - coredns: - depends_on: - - netmaker - image: coredns/coredns - command: -conf /root/dnsconfig/Corefile - container_name: coredns - restart: always - volumes: - - dnsconfig:/root/dnsconfig - caddy: - image: caddy:latest - container_name: caddy - restart: unless-stopped - ports: - - "80:80" - - "443:443" - volumes: - - /root/Caddyfile:/etc/caddy/Caddyfile - # - $PWD/site:/srv # you could also serve a static site in site folder - - caddy_data:/data - - caddy_conf:/config - mq: - image: eclipse-mosquitto:2.0.11-openssl - depends_on: - - netmaker - container_name: mq - restart: unless-stopped - ports: - - "8883:8883" - volumes: - - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf - - /root/certs/:/mosquitto/certs/ - - mosquitto_data:/mosquitto/data - - mosquitto_logs:/mosquitto/log -volumes: - caddy_data: {} - caddy_conf: {} - sqldata: {} - dnsconfig: {} - mosquitto_data: {} - mosquitto_logs: {} diff --git a/compose/docker-compose.coredns.yml b/compose/docker-compose.coredns.yml deleted file mode 100644 index e461caa2..00000000 --- a/compose/docker-compose.coredns.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: "3.4" - -services: - coredns: - image: coredns/coredns - command: -conf /root/dnsconfig/Corefile - container_name: coredns - restart: always - ports: - - "53:53/udp" - volumes: - - /root/netmaker/config/dnsconfig:/root/dnsconfig diff --git a/compose/docker-compose.hostnetwork.yml b/compose/docker-compose.hostnetwork.yml deleted file mode 100644 index f9437613..00000000 --- a/compose/docker-compose.hostnetwork.yml +++ /dev/null @@ -1,89 +0,0 @@ -version: "3.4" - -services: - netmaker: - container_name: netmaker - image: gravitl/netmaker:v0.14.5 - volumes: - - dnsconfig:/root/config/dnsconfig - - /usr/bin/wg:/usr/bin/wg - - sqldata:/root/data - - /run/xtables.lock:/run/xtables.lock - - /root/certs:/etc/netmaker/ - cap_add: - - NET_ADMIN - - NET_RAW - - SYS_MODULE - network_mode: host - restart: always - environment: - SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" - SERVER_HOST: "SERVER_PUBLIC_IP" - SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443" - COREDNS_ADDR: "SERVER_PUBLIC_IP" - DNS_MODE: "on" - SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN" - API_PORT: "8081" - CLIENT_MODE: "on" - MASTER_KEY: "REPLACE_MASTER_KEY" - CORS_ALLOWED_ORIGIN: "*" - DISPLAY_KEYS: "on" - DATABASE: "sqlite" - HOST_NETWORK: "on" - NODE_ID: "netmaker-server-1" - VERBOSITY: "1" - MANAGE_IPTABLES: "on" - PORT_FORWARD_SERVICES: "dns" - netmaker-ui: - container_name: netmaker-ui - depends_on: - - netmaker - image: gravitl/netmaker-ui:v0.14.5 - links: - - "netmaker:api" - ports: - - "8082:80" - environment: - BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" - restart: always - coredns: - depends_on: - - netmaker - image: coredns/coredns - command: -conf /root/dnsconfig/Corefile - container_name: coredns - restart: always - ports: - - "53053:53/udp" - - "53053:53/tcp" - volumes: - - dnsconfig:/root/dnsconfig - caddy: - image: caddy:latest - container_name: caddy - restart: unless-stopped - network_mode: host # Wants ports 80 and 443! - volumes: - - /root/Caddyfile:/etc/caddy/Caddyfile - # - $PWD/site:/srv # you could also serve a static site in site folder - - caddy_data:/data - - caddy_conf:/config - mq: - image: eclipse-mosquitto:2.0.11-openssl - container_name: mq - restart: unless-stopped - ports: - - "127.0.0.1:1883:1883" - - "8883:8883" - volumes: - - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf - - /root/certs/:/mosquitto/certs/ - - mosquitto_data:/mosquitto/data - - mosquitto_logs:/mosquitto/log -volumes: - caddy_data: {} - caddy_conf: {} - sqldata: {} - dnsconfig: {} - mosquitto_data: {} - mosquitto_logs: {} diff --git a/compose/docker-compose.nocaddy.yml b/compose/docker-compose.nocaddy.yml deleted file mode 100644 index baad40e2..00000000 --- a/compose/docker-compose.nocaddy.yml +++ /dev/null @@ -1,83 +0,0 @@ -version: "3.4" - -services: - netmaker: - container_name: netmaker - image: gravitl/netmaker:v0.14.5 - volumes: - - dnsconfig:/root/config/dnsconfig - - sqldata:/root/data - - /root/certs:/etc/netmaker/ - cap_add: - - NET_ADMIN - - NET_RAW - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv6.conf.all.forwarding=1 - restart: always - environment: - SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" - SERVER_HOST: "SERVER_PUBLIC_IP" - SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443" - COREDNS_ADDR: "SERVER_PUBLIC_IP" - DNS_MODE: "on" - SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN" - API_PORT: "8081" - CLIENT_MODE: "on" - MASTER_KEY: "REPLACE_MASTER_KEY" - CORS_ALLOWED_ORIGIN: "*" - DISPLAY_KEYS: "on" - DATABASE: "sqlite" - NODE_ID: "netmaker-server-1" - MQ_HOST: "mq" - HOST_NETWORK: "off" - VERBOSITY: "1" - MANAGE_IPTABLES: "on" - PORT_FORWARD_SERVICES: "dns" - ports: - - "51821-51830:51821-51830/udp" - - "8081:8081" - netmaker-ui: - container_name: netmaker-ui - depends_on: - - netmaker - image: gravitl/netmaker-ui:v0.14.5 - links: - - "netmaker:api" - ports: - - "8082:80" - environment: - BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" - restart: always - coredns: - depends_on: - - netmaker - image: coredns/coredns - command: -conf /root/dnsconfig/Corefile - container_name: coredns - restart: always - ports: - - "COREDNS_IP:53:53/udp" - - "COREDNS_IP:53:53/tcp" - volumes: - - dnsconfig:/root/dnsconfig - mq: - image: eclipse-mosquitto:2.0.11-openssl - container_name: mq - restart: unless-stopped - ports: - - "127.0.0.1:1883:1883" - - "8883:8883" - volumes: - - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf - - /root/certs/:/mosquitto/certs/ - - mosquitto_data:/mosquitto/data - - mosquitto_logs:/mosquitto/log -volumes: - sqldata: {} - dnsconfig: {} - mosquitto_data: {} - mosquitto_logs: {} diff --git a/compose/docker-compose.nodns.yml b/compose/docker-compose.nodns.yml deleted file mode 100644 index ec1d6cb9..00000000 --- a/compose/docker-compose.nodns.yml +++ /dev/null @@ -1,83 +0,0 @@ -version: "3.4" - -services: - netmaker: - container_name: netmaker - image: gravitl/netmaker:v0.14.5 - volumes: - - dnsconfig:/root/config/dnsconfig - - sqldata:/root/data - - /root/certs:/etc/netmaker/ - cap_add: - - NET_ADMIN - - NET_RAW - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv6.conf.all.forwarding=1 - restart: always - environment: - SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" - SERVER_HOST: "SERVER_PUBLIC_IP" - SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443" - COREDNS_ADDR: "SERVER_PUBLIC_IP" - DNS_MODE: "off" - SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN" - API_PORT: "8081" - CLIENT_MODE: "on" - MASTER_KEY: "REPLACE_MASTER_KEY" - CORS_ALLOWED_ORIGIN: "*" - DISPLAY_KEYS: "on" - DATABASE: "sqlite" - NODE_ID: "netmaker-server-1" - MQ_HOST: "mq" - HOST_NETWORK: "off" - VERBOSITY: "1" - MANAGE_IPTABLES: "on" - PORT_FORWARD_SERVICES: "dns" - ports: - - "51821-51830:51821-51830/udp" - - "8081:8081" - - "50051:50051" - netmaker-ui: - container_name: netmaker-ui - depends_on: - - netmaker - image: gravitl/netmaker-ui:v0.14.5 - links: - - "netmaker:api" - ports: - - "8082:80" - environment: - BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" - restart: always - caddy: - image: caddy:latest - container_name: caddy - restart: unless-stopped - network_mode: host # Wants ports 80 and 443! - volumes: - - /root/Caddyfile:/etc/caddy/Caddyfile - # - $PWD/site:/srv # you could also serve a static site in site folder - - caddy_data:/data - - caddy_conf:/config - mq: - image: eclipse-mosquitto:2.0.11-openssl - container_name: mq - restart: unless-stopped - ports: - - "127.0.0.1:1883:1883" - - "8883:8883" - volumes: - - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf - - mosquitto_data:/mosquitto/data - - mosquitto_logs:/mosquitto/log - - /root/certs/:/mosquitto/certs/ -volumes: - caddy_data: {} - caddy_conf: {} - sqldata: {} - mosquitto_data: {} - mosquitto_logs: {} diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index b73b3167..eaec4c5d 100644 --- a/compose/docker-compose.reference.yml +++ b/compose/docker-compose.reference.yml @@ -1,13 +1,10 @@ +version: "3.4" + services: netmaker: # The Primary Server for running Netmaker - privileged: true # Necessary to run sudo/root level commands on host system. Likely using this if running with host networking on. container_name: netmaker image: gravitl/netmaker:v0.14.5 - volumes: # Volume mounts necessary for CLIENT_MODE to control wireguard networking on host (except dnsconfig, which is where dns config files are stored for use by CoreDNS) - - dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration. - - sqldata:/root/data - - /root/certs:/etc/netmaker/ # cert management location - cap_add: # Necessary capabilities to set iptables when running in container + cap_add: - NET_ADMIN - NET_RAW - SYS_MODULE @@ -17,78 +14,129 @@ services: - net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.forwarding=1 restart: always - network_mode: host # Must configure with very particular settngs for host networking to work. Do not just set on! - environment: - SERVER_NAME: "" # The domain/host IP indicating the mq broker address - SERVER_HOST: "" # All the Docker Compose files pre-populate this with HOST_IP, which you replace as part of the install instructions. This will set the HTTP host. - SERVER_HTTP_HOST: "127.0.0.1" # Overrides SERVER_HOST if set. Useful for making HTTP available via different interfaces/networks. - API_PORT: 8081 # The HTTP API port for Netmaker. Used for API calls / communication from front end. If changed, need to change port of BACKEND_URL for netmaker-ui. - CLIENT_MODE: "on" # on if netmaker should run its own client, off if not. - MASTER_KEY: "secretkey" # The admin master key for accessing the API. Change this in any production installation. - CORS_ALLOWED_ORIGIN: "*" # The "allowed origin" for API requests. Change to restrict where API requests can come from. + volumes: # Volume mounts necessary for sql, coredns, and mqtt + - dnsconfig:/root/config/dnsconfig + - sqldata:/root/data + - shared_certs:/etc/netmaker + environment: # Necessary capabilities to set iptables when running in container + SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" # The domain/host IP indicating the mq broker address + SERVER_HOST: "SERVER_PUBLIC_IP" # Set to public IP of machine. + SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN" # Overrides SERVER_HOST if set. Useful for making HTTP available via different interfaces/networks. + SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443" + COREDNS_ADDR: "SERVER_PUBLIC_IP" # Address of the CoreDNS server. Defaults to SERVER_HOST + DNS_MODE: "on" # Enables DNS Mode, meaning all nodes will set hosts file for private dns settings. + API_PORT: "8081" # The HTTP API port for Netmaker. Used for API calls / communication from front end. If changed, need to change port of BACKEND_URL for netmaker-ui. + CLIENT_MODE: "on" # Depricated. CLIENT_MODE should always be ON REST_BACKEND: "on" # Enables the REST backend (API running on API_PORT at SERVER_HTTP_HOST). Change to "off" to turn off. - DNS_MODE: "on" # Enables DNS Mode, meaning config files will be generated for CoreDNS. Note, turning "off" does not remove CoreDNS. You still need to remove CoreDNS from compose file. DISABLE_REMOTE_IP_CHECK: "off" # If turned "on", Server will not set Host based on remote IP check. This is already overridden if SERVER_HOST is set. Turned "off" by default. - COREDNS_ADDR: "" # Address of the CoreDNS server. Defaults to SERVER_HOST - DISPLAY_KEYS: "on" # Show keys permanently in UI (until deleted) as opposed to 1-time display. - SERVER_API_CONN_STRING: "" # Changes the api connection string. IP:PORT format. By default is empty and uses SERVER_HOST:API_PORT - RCE: "off" # Enables setting PostUp and PostDown (arbitrary commands) on nodes from the server. Off by default. - NODE_ID: "" # Sets the name/id of the nodes that the server creates. Necessary for HA configurations to identify between servers (for instance, netmaker-1, netmaker-2, etc). For non-HA deployments, is not necessary. TELEMETRY: "on" # Whether or not to send telemetry data to help improve Netmaker. Switch to "off" to opt out of sending telemetry. - MQ_HOST: "mq" # the address of the mq server. If running from docker compose it will be "mq". Otherwise, need to input address. If using "host networking", it will find and detect the IP of the mq container. + RCE: "off" # Enables setting PostUp and PostDown (arbitrary commands) on nodes from the server. Off by default. + MASTER_KEY: "REPLACE_MASTER_KEY" # The admin master key for accessing the API. Change this in any production installation. + CORS_ALLOWED_ORIGIN: "*" # The "allowed origin" for API requests. Change to restrict where API requests can come from. + DISPLAY_KEYS: "on" # Show keys permanently in UI (until deleted) as opposed to 1-time display. + DATABASE: "sqlite" # Database to use - sqlite, postgres, or rqlite + NODE_ID: "netmaker-server-1" # used for HA - identifies this server vs other servers + MQ_HOST: "mq" # the address of the mq server. If running from docker compose it will be "mq". Otherwise, need to input address. If using "host networking", it will find and detect the IP of the mq container. + MQ_PORT: "443" # the reachable port of MQ - change if external MQ port changes (port on proxy, not necessarily the one exposed in docker-compose) HOST_NETWORK: "off" # whether or not host networking is turned on. Only turn on if configured for host networking (see docker-compose.hostnetwork.yml). Will set host-level settings like iptables. + VERBOSITY: "1" # logging verbosity level - 1, 2, or 3 MANAGE_IPTABLES: "on" # deprecated PORT_FORWARD_SERVICES: "dns" # decide which services to port forward ("dns","ssh", or "mq") + # this section is for OAuth + AUTH_PROVIDER: "" # "" + CLIENT_ID: "" # "" + CLIENT_SECRET: "" # "" + FRONTEND_URL: "" # "https://dashboard." + AZURE_TENANT: "" # "" + OIDC_ISSUER: "" # https://oidc.yourprovider.com - URL of oidc provider ports: - - "51821-51830:51821-51830/udp" - - "8081:8081" - netmaker-ui: # The Netmaker UI Component + - "51821-51830:51821-51830/udp" # wireguard ports + expose: + - "8081" # api port + labels: # only for use with traefik proxy (default) + - traefik.enable=true + - traefik.http.routers.netmaker-api.entrypoints=websecure + - traefik.http.routers.netmaker-api.rule=Host(`api.NETMAKER_BASE_DOMAIN`) + - traefik.http.routers.netmaker-api.service=netmaker-api + - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 + netmaker-ui: # The Netmaker UI Component container_name: netmaker-ui + image: gravitl/netmaker-ui:v0.14.5 depends_on: - netmaker - image: gravitl/netmaker-ui:v0.14.5 links: - "netmaker:api" - ports: - - "8082:80" + restart: always environment: - BACKEND_URL: "http://HOST_IP:8081" # URL where UI will send API requests. Change based on SERVER_HOST, SERVER_HTTP_HOST, and API_PORT - restart: always - coredns: # The DNS Server. Remove this section if DNS_MODE="off" - depends_on: - - netmaker + BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" # URL where UI will send API requests. Change based on SERVER_HOST, SERVER_HTTP_HOST, and API_PORT + expose: + - "80" + labels: + - traefik.enable=true + - traefik.http.middlewares.nmui-security.headers.accessControlAllowOriginList=*.NETMAKER_BASE_DOMAIN + - traefik.http.middlewares.nmui-security.headers.stsSeconds=31536000 + - traefik.http.middlewares.nmui-security.headers.browserXssFilter=true + - traefik.http.middlewares.nmui-security.headers.customFrameOptionsValue=SAMEORIGIN + - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.X-Robots-Tag=none + - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.Server= # Remove the server name + - traefik.http.routers.netmaker-ui.entrypoints=websecure + - traefik.http.routers.netmaker-ui.middlewares=nmui-security@docker + - traefik.http.routers.netmaker-ui.rule=Host(`dashboard.NETMAKER_BASE_DOMAIN`) + - traefik.http.routers.netmaker-ui.service=netmaker-ui + - traefik.http.services.netmaker-ui.loadbalancer.server.port=80 + coredns: # The DNS Server. CoreDNS can be removed unless doing special advanced use cases + container_name: coredns image: coredns/coredns command: -conf /root/dnsconfig/Corefile - container_name: coredns + depends_on: + - netmaker restart: always volumes: - dnsconfig:/root/dnsconfig - caddy: - image: caddy:latest - container_name: caddy - restart: unless-stopped - network_mode: host # Wants ports 80 and 443! + traefik: # the default proxy - can be replaced with caddy or nginx, but requires careful configuration + image: traefik:v2.6 + container_name: traefik + command: + - "--certificatesresolvers.http.acme.email=YOUR_EMAIL" + - "--certificatesresolvers.http.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.http.acme.tlschallenge=true" + - "--entrypoints.websecure.address=:443" + - "--entrypoints.websecure.http.tls=true" + - "--entrypoints.websecure.http.tls.certResolver=http" + - "--log.level=INFO" + - "--providers.docker=true" + - "--providers.docker.exposedByDefault=false" + - "--serverstransport.insecureskipverify=true" + restart: always volumes: - - /root/Caddyfile:/etc/caddy/Caddyfile - # - $PWD/site:/srv # you could also serve a static site in site folder - - caddy_data:/data - - caddy_conf:/config - mq: # the MQTT broker for netmaker - image: eclipse-mosquitto:2.0.11-openssl - container_name: mq - restart: unless-stopped + - /var/run/docker.sock:/var/run/docker.sock:ro + - traefik_certs:/letsencrypt ports: - - "127.0.0.1:1883:1883" - - "8883:8883" + - "443:443" + mq: # the MQTT broker for netmaker + container_name: mq + image: eclipse-mosquitto:2.0.11-openssl + depends_on: + - netmaker + restart: unless-stopped volumes: - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf # need to pull conf file from github before running (under docker/mosquitto.conf) - mosquitto_data:/mosquitto/data - mosquitto_logs:/mosquitto/log - - /root/certs/:/mosquitto/certs/ + - shared_certs:/mosquitto/certs + expose: + - "8883" + labels: + - traefik.enable=true + - traefik.tcp.routers.mqtts.rule=HostSNI(`broker.NETMAKER_BASE_DOMAIN`) + - traefik.tcp.routers.mqtts.tls.passthrough=true + - traefik.tcp.services.mqtts-svc.loadbalancer.server.port=8883 + - traefik.tcp.routers.mqtts.service=mqtts-svc + - traefik.tcp.routers.mqtts.entrypoints=websecure volumes: - caddy_data: {} # storage for caddy data - caddy_conf: {} # storage for caddy configuration file + traefik_certs: {} # ssl certificates - auto generated + shared_certs: {} # netmaker certs generated for MQ comms - used by nodes/servers sqldata: {} # storage for embedded sqlite dnsconfig: {} # storage for coredns mosquitto_data: {} # storage for mqtt data - mosquitto_logs: {} # storage for mqtt logs + mosquitto_logs: {} # storage for mqtt logs \ No newline at end of file diff --git a/compose/docker-compose.traefik.yml b/compose/docker-compose.traefik.yml deleted file mode 100644 index 3930b5b1..00000000 --- a/compose/docker-compose.traefik.yml +++ /dev/null @@ -1,132 +0,0 @@ -version: "3.4" - -services: - netmaker: - container_name: netmaker - image: gravitl/netmaker:v0.14.5 - cap_add: - - NET_ADMIN - - NET_RAW - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv6.conf.all.forwarding=1 - restart: always - volumes: - - dnsconfig:/root/config/dnsconfig - - sqldata:/root/data - - shared_certs:/etc/netmaker - environment: - SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" - SERVER_HOST: "SERVER_PUBLIC_IP" - SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443" - COREDNS_ADDR: "SERVER_PUBLIC_IP" - DNS_MODE: "on" - SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN" - API_PORT: "8081" - CLIENT_MODE: "on" - MASTER_KEY: "REPLACE_MASTER_KEY" - CORS_ALLOWED_ORIGIN: "*" - DISPLAY_KEYS: "on" - DATABASE: "sqlite" - NODE_ID: "netmaker-server-1" - MQ_HOST: "mq" - # uncomment once netmaker supports changing MQ port - MQ_PORT: "443" - HOST_NETWORK: "off" - VERBOSITY: "1" - MANAGE_IPTABLES: "on" - PORT_FORWARD_SERVICES: "dns" - ports: - - "51821-51830:51821-51830/udp" - expose: - - "8081" - labels: - - traefik.enable=true - - traefik.http.routers.netmaker-api.entrypoints=websecure - - traefik.http.routers.netmaker-api.rule=Host(`api.NETMAKER_BASE_DOMAIN`) - - traefik.http.routers.netmaker-api.service=netmaker-api - - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 - netmaker-ui: - container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.14.5 - depends_on: - - netmaker - links: - - "netmaker:api" - restart: always - environment: - BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" - expose: - - "80" - labels: - - traefik.enable=true - - traefik.http.middlewares.nmui-security.headers.accessControlAllowOriginList=*.NETMAKER_BASE_DOMAIN - - traefik.http.middlewares.nmui-security.headers.stsSeconds=31536000 - - traefik.http.middlewares.nmui-security.headers.browserXssFilter=true - - traefik.http.middlewares.nmui-security.headers.customFrameOptionsValue=SAMEORIGIN - - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.X-Robots-Tag=none - - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.Server= # Remove the server name - - traefik.http.routers.netmaker-ui.entrypoints=websecure - - traefik.http.routers.netmaker-ui.middlewares=nmui-security@docker - - traefik.http.routers.netmaker-ui.rule=Host(`dashboard.NETMAKER_BASE_DOMAIN`) - - traefik.http.routers.netmaker-ui.service=netmaker-ui - - traefik.http.services.netmaker-ui.loadbalancer.server.port=80 - coredns: - container_name: coredns - image: coredns/coredns - command: -conf /root/dnsconfig/Corefile - depends_on: - - netmaker - restart: always - volumes: - - dnsconfig:/root/dnsconfig - traefik: - image: traefik:v2.6 - container_name: traefik - command: - - "--certificatesresolvers.http.acme.email=YOUR_EMAIL" - - "--certificatesresolvers.http.acme.storage=/letsencrypt/acme.json" - - "--certificatesresolvers.http.acme.tlschallenge=true" - - "--entrypoints.websecure.address=:443" - - "--entrypoints.websecure.http.tls=true" - - "--entrypoints.websecure.http.tls.certResolver=http" - - "--log.level=INFO" - - "--providers.docker=true" - - "--providers.docker.exposedByDefault=false" - - "--serverstransport.insecureskipverify=true" - restart: always - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - - traefik_certs:/letsencrypt - ports: - - "443:443" - mq: - container_name: mq - image: eclipse-mosquitto:2.0.11-openssl - depends_on: - - netmaker - restart: unless-stopped - volumes: - - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf - - mosquitto_data:/mosquitto/data - - mosquitto_logs:/mosquitto/log - - shared_certs:/mosquitto/certs - expose: - - "8883" - labels: - - traefik.enable=true - - traefik.tcp.routers.mqtts.rule=HostSNI(`broker.NETMAKER_BASE_DOMAIN`) - - traefik.tcp.routers.mqtts.tls.passthrough=true - - traefik.tcp.services.mqtts-svc.loadbalancer.server.port=8883 - - traefik.tcp.routers.mqtts.service=mqtts-svc - - traefik.tcp.routers.mqtts.entrypoints=websecure -volumes: - traefik_certs: {} - shared_certs: {} - sqldata: {} - dnsconfig: {} - mosquitto_data: {} - mosquitto_logs: {} diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 424001d5..c57cd20d 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -4,10 +4,6 @@ services: netmaker: container_name: netmaker image: gravitl/netmaker:v0.14.5 - volumes: - - dnsconfig:/root/config/dnsconfig - - sqldata:/root/data - - /root/certs:/etc/netmaker/ cap_add: - NET_ADMIN - NET_RAW @@ -18,6 +14,10 @@ services: - net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.forwarding=1 restart: always + volumes: + - dnsconfig:/root/config/dnsconfig + - sqldata:/root/data + - shared_certs:/etc/netmaker environment: SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" SERVER_HOST: "SERVER_PUBLIC_IP" @@ -33,59 +33,98 @@ services: DATABASE: "sqlite" NODE_ID: "netmaker-server-1" MQ_HOST: "mq" + MQ_PORT: "443" HOST_NETWORK: "off" VERBOSITY: "1" MANAGE_IPTABLES: "on" PORT_FORWARD_SERVICES: "dns" ports: - "51821-51830:51821-51830/udp" + expose: + - "8081" + labels: + - traefik.enable=true + - traefik.http.routers.netmaker-api.entrypoints=websecure + - traefik.http.routers.netmaker-api.rule=Host(`api.NETMAKER_BASE_DOMAIN`) + - traefik.http.routers.netmaker-api.service=netmaker-api + - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 netmaker-ui: container_name: netmaker-ui + image: gravitl/netmaker-ui:v0.14.5 depends_on: - netmaker - image: gravitl/netmaker-ui:v0.14.5 links: - "netmaker:api" + restart: always environment: BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" - restart: always + expose: + - "80" + labels: + - traefik.enable=true + - traefik.http.middlewares.nmui-security.headers.accessControlAllowOriginList=*.NETMAKER_BASE_DOMAIN + - traefik.http.middlewares.nmui-security.headers.stsSeconds=31536000 + - traefik.http.middlewares.nmui-security.headers.browserXssFilter=true + - traefik.http.middlewares.nmui-security.headers.customFrameOptionsValue=SAMEORIGIN + - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.X-Robots-Tag=none + - traefik.http.middlewares.nmui-security.headers.customResponseHeaders.Server= # Remove the server name + - traefik.http.routers.netmaker-ui.entrypoints=websecure + - traefik.http.routers.netmaker-ui.middlewares=nmui-security@docker + - traefik.http.routers.netmaker-ui.rule=Host(`dashboard.NETMAKER_BASE_DOMAIN`) + - traefik.http.routers.netmaker-ui.service=netmaker-ui + - traefik.http.services.netmaker-ui.loadbalancer.server.port=80 coredns: - depends_on: - - netmaker + container_name: coredns image: coredns/coredns command: -conf /root/dnsconfig/Corefile - container_name: coredns + depends_on: + - netmaker restart: always volumes: - dnsconfig:/root/dnsconfig - caddy: - image: caddy:latest - container_name: caddy - restart: unless-stopped - ports: - - "80:80" - - "443:443" + traefik: + image: traefik:v2.6 + container_name: traefik + command: + - "--certificatesresolvers.http.acme.email=YOUR_EMAIL" + - "--certificatesresolvers.http.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.http.acme.tlschallenge=true" + - "--entrypoints.websecure.address=:443" + - "--entrypoints.websecure.http.tls=true" + - "--entrypoints.websecure.http.tls.certResolver=http" + - "--log.level=INFO" + - "--providers.docker=true" + - "--providers.docker.exposedByDefault=false" + - "--serverstransport.insecureskipverify=true" + restart: always volumes: - - /root/Caddyfile:/etc/caddy/Caddyfile - # - $PWD/site:/srv # you could also serve a static site in site folder - - caddy_data:/data - - caddy_conf:/config + - /var/run/docker.sock:/var/run/docker.sock:ro + - traefik_certs:/letsencrypt + ports: + - "443:443" mq: + container_name: mq image: eclipse-mosquitto:2.0.11-openssl depends_on: - netmaker - container_name: mq restart: unless-stopped - ports: - - "8883:8883" volumes: - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf - - /root/certs/:/mosquitto/certs/ - mosquitto_data:/mosquitto/data - mosquitto_logs:/mosquitto/log + - shared_certs:/mosquitto/certs + expose: + - "8883" + labels: + - traefik.enable=true + - traefik.tcp.routers.mqtts.rule=HostSNI(`broker.NETMAKER_BASE_DOMAIN`) + - traefik.tcp.routers.mqtts.tls.passthrough=true + - traefik.tcp.services.mqtts-svc.loadbalancer.server.port=8883 + - traefik.tcp.routers.mqtts.service=mqtts-svc + - traefik.tcp.routers.mqtts.entrypoints=websecure volumes: - caddy_data: {} - caddy_conf: {} + traefik_certs: {} + shared_certs: {} sqldata: {} dnsconfig: {} mosquitto_data: {} From 24cda37f280e90b9609daca6f79e6347adbce294 Mon Sep 17 00:00:00 2001 From: afeiszli Date: Thu, 7 Jul 2022 10:58:04 -0400 Subject: [PATCH 2/2] change link on quick start --- scripts/nm-quick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index fe6a8753..73bc18e0 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -133,7 +133,7 @@ echo "setting docker-compose..." mkdir -p /etc/netmaker -wget -q -O /root/docker-compose.yml https://raw.githubusercontent.com/gravitl/netmaker/master/compose/docker-compose.traefik.yml +wget -q -O /root/docker-compose.yml https://raw.githubusercontent.com/gravitl/netmaker/master/compose/docker-compose.yml sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/docker-compose.yml sed -i "s/SERVER_PUBLIC_IP/$SERVER_PUBLIC_IP/g" /root/docker-compose.yml sed -i "s/COREDNS_IP/$COREDNS_IP/g" /root/docker-compose.yml