From e370e24d460514b5899c0da8e8e6c5499238e6bb Mon Sep 17 00:00:00 2001 From: Adam Heathcote Date: Fri, 20 Aug 2021 10:57:19 +1000 Subject: [PATCH] Added NETMAKER_BASE_DOMAIN variable+change to nginx conf NETMAKER_BASE_DOMAIN may as well be a variable that can be substituted into the quick start setup so people can just copy and paste without too much hassle. In addition I have change the NGINX config file location to be more in line with Debian standard as the default preferred OS is Ubuntu anyway. --- docs/quick-start.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/quick-start.rst b/docs/quick-start.rst index b1d30a06..03e7a86d 100644 --- a/docs/quick-start.rst +++ b/docs/quick-start.rst @@ -117,10 +117,11 @@ On Ubuntu 20.04, by default there is a service consuming port 53 related to DNS .. code-block:: systemctl stop systemd-resolved - systemctl disable systemd-resolved vim /etc/systemd/resolved.conf * uncomment DNS and add 8.8.8.8 or whatever reachable nameserver is your preference * * uncomment DNSStubListener and set to "no" * + systemctl start systemd-resolved + systemctl disable --now systemd-resolved ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf @@ -137,8 +138,10 @@ Insert your domain in the configuration file and add to nginx: .. code-block:: - sed -i 's/NETMAKER_BASE_DOMAIN//g' netmaker-nginx-template.conf - sudo cp netmaker-nginx-template.conf /etc/nginx/conf.d/.conf + NETMAKER_BASE_DOMAIN= + sed -i 's/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g' netmaker-nginx-template.conf + sudo cp netmaker-nginx-template.conf /etc/nginx/sites-available/netmaker-nginx.conf + sudo ln -s /etc/nginx/sites-available/netmaker-nginx.conf /etc/nginx/sites-enabled/netmaker.nginx.conf nginx -t && nginx -s reload systemctl restart nginx @@ -151,7 +154,7 @@ Prepare Templates .. code-block:: wget https://raw.githubusercontent.com/gravitl/netmaker/develop/compose/docker-compose.quickstart.yml - sed -i 's/NETMAKER_BASE_DOMAIN//g' docker-compose.quickstart.yml + sed -i 's/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g' docker-compose.quickstart.yml sed -i 's/SERVER_PUBLIC_IP//g' docker-compose.quickstart.yml Generate a unique master key and insert it: @@ -172,4 +175,4 @@ To troubleshoot issues, start with: ``docker logs netmaker`` -Or check out the :doc:`troubleshoooting docs <./troubleshoot>`. \ No newline at end of file +Or check out the :doc:`troubleshoooting docs <./troubleshoot>`.