Merge pull request #104 from microsoft/apcfg

Enable integration of components on test+development machines

src/linux/external/hostap/CMakeLists.txt

@@ -83,4 +83,16 @@ set(HOSTAPD_BIN
     "hostapd daemon binary"
 )
 
+install(
+    FILES ${LIBWPA_CLIENT}
+    TYPE LIB
+)
+
+install(
+    PROGRAMS
+        ${HOSTAPD_BIN}
+    DESTINATION
+        ${CMAKE_INSTALL_SBINDIR}
+)
+
 add_subdirectory(systemd)

src/linux/external/hostap/systemd/CMakeLists.txt

@@ -1,20 +1,22 @@
 
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/hostapd.conf
-    ${CMAKE_CURRENT_BINARY_DIR}/hostapd.conf)
+    ${CMAKE_CURRENT_SOURCE_DIR}/hostapd.example.conf
+    ${CMAKE_CURRENT_BINARY_DIR}/hostapd.example.conf
+)
 
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/hostapd.service.in
-    ${CMAKE_CURRENT_BINARY_DIR}/hostapd.service
+    ${CMAKE_CURRENT_SOURCE_DIR}/hostapd@.service.in
+    ${CMAKE_CURRENT_BINARY_DIR}/hostapd@.service
 )
 
 install(
     FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/hostapd.conf
-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/hostapd)
+        ${CMAKE_CURRENT_BINARY_DIR}/hostapd.example.conf
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/hostapd
+)
 
 install(
     FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/hostapd.service
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system
-)
+        ${CMAKE_CURRENT_BINARY_DIR}/hostapd@.service
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/systemd/system
+)

src/linux/external/hostap/systemd/hostapd.example.conf

@@ -0,0 +1,20 @@
+#
+# Default hostapd configuration file.
+# 
+# To use this with the provided systemd service unit template [email protected], 
+# (eg. via 'systemctl enable hostapd@wlan0'), copy this file to 
+# /etc/hostapd/hostapd-<interface>.conf. For example, to use it with wlan0, copy this file to
+# /etc/hostapd/hostapd-wlan0.conf.
+#
+
+driver=nl80211
+ctrl_interface=${CMAKE_INSTALL_FULL_RUNSTATEDIR}/hostapd
+ssid=wificontrollertest
+hw_mode=g
+channel=1
+auth_algs=3
+wpa=2
+wpa_passphrase=password
+wpa_key_mgmt=WPA-PSK WPA-PSK-SHA256 SAE
+wpa_pairwise=TKIP CCMP
+rsn_pairwise=CCMP

src/linux/external/hostap/systemd/hostapd@.service.in

@@ -0,0 +1,13 @@
+[Unit]
+Description=Hostapd Daemon
+Requires=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=forking
+Restart=on-failure
+ExecStart=${CMAKE_INSTALL_FULL_SBINDIR}/hostapd -B -P ${CMAKE_INSTALL_FULL_RUNSTATEDIR}/hostapd/hostapd-%i.pid -i %i ${CMAKE_INSTALL_FULL_SYSCONFDIR}/hostapd/hostapd-%i.conf
+PIDFile=${CMAKE_INSTALL_FULL_RUNSTATEDIR}/hostapd/hostapd-%i.pid
+
+[Install]
+WantedBy=default.target

src/linux/server/systemd/CMakeLists.txt

@@ -7,5 +7,5 @@ configure_file(
 install(
     FILES
         ${CMAKE_CURRENT_BINARY_DIR}/netremote-server.service
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/systemd/system
 )