From 6877bb2ac2bb786df30edf0f6f766c43663dd60d Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Mon, 18 Sep 2017 10:19:46 -0500
Subject: [PATCH] typo eth0 (#251)

correct service name

lets shut-up systemd

keep wifi variables with networking - remove unused variable
---
 roles/1-prep/defaults/main.yml      | 3 ---
 roles/idmgr/tasks/main.yml          | 2 +-
 roles/kiwix/tasks/kiwix_install.yml | 2 +-
 roles/network/defaults/main.yml     | 4 +++-
 roles/network/tasks/dhcpd.yml       | 2 +-
 roles/network/tasks/restart.yml     | 3 +--
 roles/network/tasks/rpi_debian.yml  | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/roles/1-prep/defaults/main.yml b/roles/1-prep/defaults/main.yml
index 88fac563e..91feb2145 100644
--- a/roles/1-prep/defaults/main.yml
+++ b/roles/1-prep/defaults/main.yml
@@ -45,9 +45,6 @@ has_wifi_gw: "none"
 ap_device: "none"
 device_gw2: ""
 
-# WiFi
-ssid: XSCE
-hostapd_wait: 10
 gui_port: 80
 
 # must keep roles/iiab-admin/defaults/main.yml sync'd
diff --git a/roles/idmgr/tasks/main.yml b/roles/idmgr/tasks/main.yml
index 2b062dc4f..a738d231d 100644
--- a/roles/idmgr/tasks/main.yml
+++ b/roles/idmgr/tasks/main.yml
@@ -19,7 +19,7 @@
             mode={{ item.mode }}
   with_items:
     - { src: 'idmgr', dest: '/etc/idmgr.conf', mode: '0644' }
-    - { src: 'idmgr.service.j2', dest: '/etc/systemd/system/idmgr.service', mode: '0755'}
+    - { src: 'idmgr.service.j2', dest: '/etc/systemd/system/idmgr.service', mode: '0644'}
 
 - name: Configure ds-backup
   command: /etc/sysconfig/olpc-scripts/setup.d/ds-backup
diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml
index 5a653631d..b0d5ec5dc 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/kiwix_install.yml
@@ -97,7 +97,7 @@
             group=root
             mode={{ item.mode }}
   with_items:
-    - { src: 'kiwix-serve.service.j2', dest: '/etc/systemd/system/kiwix-serve.service', mode: '0655'}
+    - { src: 'kiwix-serve.service.j2', dest: '/etc/systemd/system/kiwix-serve.service', mode: '0644'}
 
 #    - { src: 'kiwix-serve-init.j2', dest: '/usr/libexec/kiwix-serve-init', mode: '0755'}
     - { src: 'iiab-make-kiwix-lib', dest: '/usr/bin/iiab-make-kiwix-lib', mode: '0755'}
diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml
index cdf53dc00..722761dda 100644
--- a/roles/network/defaults/main.yml
+++ b/roles/network/defaults/main.yml
@@ -5,7 +5,9 @@ gui_static_wan_ip: "unset"
 gui_desired_network_role: Gateway
 wondershaper_dspeed: "4096"
 wondershaper_upspeed: "1024"
-host_ssid: "XSCE"
+# WiFi
+host_ssid: IIAB
+hostapd_wait: 10
 host_wifi_mode: g
 host_channel: 6
 host_wireless_n: False
diff --git a/roles/network/tasks/dhcpd.yml b/roles/network/tasks/dhcpd.yml
index 653c8f04c..9d7ea39ba 100644
--- a/roles/network/tasks/dhcpd.yml
+++ b/roles/network/tasks/dhcpd.yml
@@ -24,7 +24,7 @@
             mode={{ item.mode }}
   with_items:
    - { src: 'dhcp/dhcpd-iiab.conf.j2', dest: '/etc/dhcpd-iiab.conf', mode: '0644' }
-   - { src: 'dhcp/dhcpd.service', dest: '/etc/systemd/system/dhcpd.service', mode: '0755' }
+   - { src: 'dhcp/dhcpd.service', dest: '/etc/systemd/system/dhcpd.service', mode: '0644' }
 
 - name: Create dhcpd needed files
   command: touch /var/lib/dhcpd/dhcpd.leases
diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 60e042755..c557112b7 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -1,6 +1,6 @@
 # dhcpd service is restarted with NM dispatcher.d script
 - name: Stop dhcpd
-  service: name={{ dns_service }}
+  service: name=dhcpd
            state=stopped
   when: not dhcpd_enabled
 
@@ -54,4 +54,3 @@
 
 - name: Run iptables
   command: /usr/bin/iiab-gen-iptables
-
diff --git a/roles/network/tasks/rpi_debian.yml b/roles/network/tasks/rpi_debian.yml
index c763ebddd..c019d8c93 100644
--- a/roles/network/tasks/rpi_debian.yml
+++ b/roles/network/tasks/rpi_debian.yml
@@ -59,7 +59,7 @@
   when: interface.changed
 
 - name: reset the eth0 interface 
-  command: ifdown etho
+  command: ifdown eth0
   ignore_errors: True
   when: interface.changed