1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #769 from jvonau/ubu-16-net

NM not playing nice on ubuntu-16, use older method
This commit is contained in:
A Holt 2018-05-01 17:26:05 -04:00 committed by GitHub
commit 3f5b372bc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 4 deletions

View file

@ -106,7 +106,7 @@
- name: NetworkManager in use
include_tasks: NM-debian.yml
when: is_debuntu and network_manager_active
when: is_ubuntu_18 and network_manager_active
#and not installing
tags:
- network
@ -127,7 +127,7 @@
- name: Not RPi, Not NetworkManager, Not systemd-networkd in use
include_tasks: debian.yml
when: not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu
when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16
#and not installing
tags:
- network

View file

@ -1,6 +1,6 @@
[Unit]
Description=DHCPv4 Server Daemon
After=network-online.target
After=rc-local.service
[Service]
EnvironmentFile=/etc/sysconfig/dhcpd

View file

@ -1,6 +1,6 @@
[Unit]
Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
After=rc-local.service
After=network-online.target
[Service]
Type=idle

View file

@ -383,6 +383,7 @@ xovis_chart_heading: "My School: Usage Data Visualization"
# wide to narrow
is_debuntu: False
is_ubuntu: False
is_ubuntu_16: False
is_ubuntu_18: False
is_debian: False
is_debian_9: False

View file

@ -1,5 +1,6 @@
is_debuntu: True
is_ubuntu: True
is_ubuntu_16: True
dns_service: bind9
dns_user: bind
dhcp_service: isc-dhcp-server