Merge pull request #218 from gravitl/v0.7.1

V0.7.1

compose/docker-compose.yml

@@ -1,23 +1,19 @@
 version: "3.4"
 
 services:
-  mongodb:
-    image: mongo:4.2
-    ports:
-      - "27017:27017"
-    container_name: mongodb
-    volumes:
-      - mongovol:/data/db
+  rqlite:
+    container_name: rqlite
+    image: rqlite/rqlite
+    network_mode: host
     restart: always
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: mongoadmin
-      MONGO_INITDB_ROOT_PASSWORD: mongopass
+    volumes:
+      - sqldata:/rqlite/file/data
   netmaker:
+    depends_on:
+      - rqlite
     privileged: true
     container_name: netmaker
-    depends_on:
-      - mongodb
-    image: gravitl/netmaker:v0.5
+    image: gravitl/netmaker:v0.7
     volumes:
       - ./:/local
       - /etc/netclient:/etc/netclient
@@ -33,18 +29,29 @@ services:
     restart: always
     network_mode: host
     environment:
-      SERVER_HOST: "HOST_IP"
+      SERVER_HOST: "SERVER_PUBLIC_IP"
+      SERVER_API_CONN_STRING: "SERVER_PUBLIC_IP:8081"
+      SERVER_GRPC_CONN_STRING: "SERVER_PUBLIC_IP:50051"
+      COREDNS_ADDR: "SERVER_PUBLIC_IP"
+      GRPC_SSL: "off"
+      DNS_MODE: "on"
+      SERVER_HTTP_HOST: "SERVER_PUBLIC_IP"
+      SERVER_GRPC_HOST: "SERVER_PUBLIC_IP"
+      API_PORT: "8081"
+      GRPC_PORT: "50051"
+      MASTER_KEY: "REPLACE_MASTER_KEY"
+      CORS_ALLOWED_ORIGIN: "*"
   netmaker-ui:
     container_name: netmaker-ui
     depends_on:
       - netmaker
-    image: gravitl/netmaker-ui:v0.5
+    image: gravitl/netmaker-ui:v0.7
     links:
       - "netmaker:api"
     ports:
-      - "80:80"
+      - "8082:80"
     environment:
-      BACKEND_URL: "http://HOST_IP:8081"
+      BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN"
   coredns:
     depends_on:
       - netmaker 
@@ -57,5 +64,5 @@ services:
     volumes:
       - dnsconfig:/root/dnsconfig
 volumes:
-  mongovol: {}
+  sqldata: {}
   dnsconfig: {}

docs/_build/html/_sources/index.rst.txt

@@ -136,16 +136,6 @@ Where to go for help, and a FAQ.
 
    support
 
-
-Contributing
------------------
-
-A guide on how to contribute to the Netmaker project.
-
-.. toctree:: 
-
-        contribute.rst
-
 Code of Conduct
 -----------------
 

docs/_build/html/genindex.html

@@ -600,34 +600,6 @@
       <a href="support.html#contact" class="md-nav__link">Contact</a>
       
     
-    </li></ul>
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html" class="md-nav__link">Contribute</a>
-      <ul class="md-nav__list"> 
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#submitting-an-issue" class="md-nav__link">Submitting an Issue</a>
-      
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#submitting-an-enhancement" class="md-nav__link">Submitting an Enhancement</a>
-      
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#contributing-code" class="md-nav__link">Contributing Code</a>
-      
-    
     </li></ul>
     
     </li>

docs/_build/html/index.html

@@ -601,34 +601,6 @@
       <a href="support.html#contact" class="md-nav__link">Contact</a>
       
     
-    </li></ul>
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html" class="md-nav__link">Contribute</a>
-      <ul class="md-nav__list"> 
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#submitting-an-issue" class="md-nav__link">Submitting an Issue</a>
-      
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#submitting-an-enhancement" class="md-nav__link">Submitting an Enhancement</a>
-      
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#contributing-code" class="md-nav__link">Contributing Code</a>
-      
-    
     </li></ul>
     
     </li>
@@ -724,8 +696,6 @@
         </li>
         <li class="md-nav__item"><a href="#support" class="md-nav__link">Support</a>
         </li>
-        <li class="md-nav__item"><a href="#contributing" class="md-nav__link">Contributing</a>
-        </li>
         <li class="md-nav__item"><a href="#code-of-conduct" class="md-nav__link">Code of Conduct</a>
         </li>
         <li class="md-nav__item"><a href="#licensing" class="md-nav__link">Licensing</a>
@@ -906,26 +876,6 @@
 </div>
 
 
-<h2 id="contributing">Contributing<a class="headerlink" href="#contributing" title="Permalink to this headline">¶</a></h2>
-<p>A guide on how to contribute to the Netmaker project.</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="contribute.html">Contribute</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="contribute.html#submitting-an-issue">Submitting an Issue</a></li>
-<li class="toctree-l2"><a class="reference internal" href="contribute.html#submitting-an-enhancement">Submitting an Enhancement</a></li>
-<li class="toctree-l2"><a class="reference internal" href="contribute.html#contributing-code">Contributing Code</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="contribute.html#forking">Forking</a></li>
-<li class="toctree-l3"><a class="reference internal" href="contribute.html#building">Building</a></li>
-<li class="toctree-l3"><a class="reference internal" href="contribute.html#testing">Testing</a></li>
-<li class="toctree-l3"><a class="reference internal" href="contribute.html#submitting-a-pr">Submitting a PR</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-
-
 <h2 id="code-of-conduct">Code of Conduct<a class="headerlink" href="#code-of-conduct" title="Permalink to this headline">¶</a></h2>
 <p>A statement on our expectations and pledge to the community.</p>
 <div class="toctree-wrapper compound">

docs/_build/html/search.html

@@ -606,34 +606,6 @@
       <a href="support.html#contact" class="md-nav__link">Contact</a>
       
     
-    </li></ul>
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html" class="md-nav__link">Contribute</a>
-      <ul class="md-nav__list"> 
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#submitting-an-issue" class="md-nav__link">Submitting an Issue</a>
-      
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#submitting-an-enhancement" class="md-nav__link">Submitting an Enhancement</a>
-      
-    
-    </li>
-    <li class="md-nav__item">
-    
-    
-      <a href="contribute.html#contributing-code" class="md-nav__link">Contributing Code</a>
-      
-    
     </li></ul>
     
     </li>

docs/contribute.rst

@@ -1,26 +0,0 @@
-===========
-Contribute
-===========
-
-Submitting an Issue
-====================
-
-Submitting an Enhancement
-==========================
-
-Contributing Code
-==================
-
-Forking
-----------
-
-Building
------------
-
-Testing
-----------
-
-Submitting a PR
------------------
-
-

docs/index.rst

@@ -136,16 +136,6 @@ Where to go for help, and a FAQ.
 
    support
 
-
-Contributing
------------------
-
-A guide on how to contribute to the Netmaker project.
-
-.. toctree:: 
-
-        contribute.rst
-
 Code of Conduct
 -----------------
 

models/node.go

@@ -120,7 +120,7 @@ func (node *Node) SetIsLocalDefault() {
 
 func (node *Node) SetDNSOnDefault() {
 	if node.DNSOn == "" {
-		node.DNSOn = "no"
+		node.DNSOn = "yes"
 	}
 }
 

netclient/main.go

@@ -147,10 +147,10 @@ func main() {
 			Usage:   "Local Range if network is local, for instance 192.168.1.0/24.",
 		},
 		&cli.StringFlag{
-			Name:    "dns",
+			Name:    "dnson",
 			EnvVars: []string{"NETCLIENT_DNS"},
-			Value:   "on",
-			Usage:   "Sets private dns if 'on'. Ignores if 'off'. Will retrieve from network if unset.",
+			Value:   "yes",
+			Usage:   "Sets private dns if 'yes'. Ignores if 'no'. Will retrieve from network if unset.",
 		},
 		&cli.StringFlag{
 			Name:    "islocal",