Merge pull request #277 from jvonau/myway

Allow iiab-admin to be optional again

roles/3-base-server/tasks/main.yml

@@ -2,24 +2,6 @@
   file: dest={{ doc_root }}/local_content
         state=directory
 
-- name: Set up to issue warning if iiab-admin password is still default
-  template: src=profile_ssh_warn.sh
-            dest=/etc/profile.d/
-
-- name: Is this LXDE?
-  stat: path=/home/pi/.config/lxsession
-  register: lx
-
-- name: Do the same if running on raspbian
-  template: src=lxde_ssh_warn.sh
-            dest=/home/pi/.config/lxsession/LXDE-pi/
-  when: lx.stat.isdir is defined and lx.staat.isdir and is_rpi and is_debuntu
-
-- name: put a autostart line to check for default password in LXDE
-  lineinfile: line=@/home/pi/.config/lxsession/LXDE-pi/lxde_ssh_warn.sh
-              dest=/home/pi/.config/lxsession/LXDE-pi/autostart
-  when: lx.stat.isdir is defined and lx.staat.isdir and is_rpi and is_debuntu
-
 - name: Base Server Installed
   command: echo Base Server Installed
 

roles/iiab-admin/tasks/main.yml

@@ -1,6 +1,7 @@
 - include: admin-user.yml
   tags:
     - base
+  when: not no_admin is defined
 
 - include: access.yml
   tags:
@@ -18,3 +19,21 @@
       value: '"Admin User"'
     - option: iiab_admin_user
       value: "{{ iiab_admin_user }}"
+
+- name: Set up to issue warning if iiab-admin password is still default
+  template: src=profile_ssh_warn.sh
+            dest=/etc/profile.d/
+
+- name: Is this LXDE?
+  stat: path=/home/pi/.config/lxsession
+  register: lx
+
+- name: Do the same if running on raspbian
+  template: src=lxde_ssh_warn.sh
+            dest=/home/pi/.config/lxsession/LXDE-pi/
+  when: lx.stat.isdir is defined and lx.staat.isdir and is_rpi and is_debuntu
+
+- name: put a autostart line to check for default password in LXDE
+  lineinfile: line=@/home/pi/.config/lxsession/LXDE-pi/lxde_ssh_warn.sh
+              dest=/home/pi/.config/lxsession/LXDE-pi/autostart
+  when: lx.stat.isdir is defined and lx.staat.isdir and is_rpi and is_debuntu

roles/iiab-admin/templates/lxde_ssh_warn.sh

@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # credit to the folks at raspberry pi foundatioon
 check_hash ()
 {

roles/iiab-admin/templates/profile_ssh_warn.sh

@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # credit to the folks at raspberry pi foundatioon
 check_hash ()
 {