Move default ssid argument to common arguments.

Author: amrsoll

extras/netconnectd.yaml

@@ -28,7 +28,7 @@ ap:
   #driver: nl80211
 
   # your AP wifi's SSID
-  ssid: MrBeam2-AP
+  #ssid: MrBeam2-AP
 
   # your AP wifi's passphrase
   psk: mrbeamsetup

netconnectd/server.py

@@ -1069,8 +1069,6 @@ def dhcp_range(arg):
     config = copy.deepcopy(default_config)
 
     configfile = args.config
-    if not configfile:
-        configfile = "/etc/netconnectd.yaml"
 
     import os
 
@@ -1145,12 +1143,9 @@ def dhcp_range(arg):
             "Wifi interface is missing, supply with either --interface-wifi or via config file"
         )
     if not config["ap"]["ssid"]:
-        try:
-            import socket
-            # Default SSID should be the hostname
-            config["ap"]["ssid"] = socket.gethostname()
-        except Exception:
-            parse.error("Failed to read system hostname")
+        parser.error(
+            "AP SSID is missing, supply with either --ap-ssid or via config file"
+        )
 
     if args.foreground:
         # start directly instead of as daemon

netconnectd/util.py

@@ -1,6 +1,7 @@
 from __future__ import print_function, absolute_import
 
 import argparse
+import socket
 import subprocess
 import yaml
 import os
@@ -14,7 +15,7 @@
     help="Address of Unix Domain Socket used for communication",
 )
 common_arguments.add_argument(
-    "-c", "--config", type=str, help="Location of config file to use"
+    "-c", "--config", type=str, help="Location of config file to use", default="/etc/netconnectd.yaml"
 )
 
 
@@ -50,7 +51,7 @@ class InvalidConfig(Exception):
     ap=dict(
         name="netconnectd_ap",
         driver="nl80211",
-        ssid=None,
+        ssid=socket.gethostname(),
         psk=None,
         channel=3,
         ip="10.250.250.1",
@@ -78,7 +79,7 @@ def parse_configfile(configfile):
     if not os.path.exists(configfile):
         return None
 
-    mandatory = ("interface.wifi", "ap.ssid")
+    mandatory = ("interfaces.wifi")
 
     try:
         with open(configfile, "r") as f: