From 5bfeb19a8783da68f10950b9690b8ac62b74e190 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 31 Aug 2016 10:46:27 -0400 Subject: [PATCH 1/9] moving mods to 0-once broke this --- roles/0-once/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/0-once/tasks/main.yml b/roles/0-once/tasks/main.yml index 075468fa..87ff272f 100644 --- a/roles/0-once/tasks/main.yml +++ b/roles/0-once/tasks/main.yml @@ -1,3 +1,8 @@ +- name: Set flag for fedora 18 + set_fact: + is_F18: True + when: ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18" + - include: selinux.yml when: ansible_selinux is defined and ansible_version >= '2' and ansible_selinux or ansible_selinux['status'] is defined and ansible_version < '2' and ansible_selinux['status'] != 'disabled' From 1507918d2e74ad23fd0f90546a07e194bcd1e99e Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 1 Sep 2016 12:52:20 -0400 Subject: [PATCH 2/9] f18 does not have ansible_machine_id --- roles/1-prep/tasks/computed_vars.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/1-prep/tasks/computed_vars.yml b/roles/1-prep/tasks/computed_vars.yml index 57375092..6712ad72 100644 --- a/roles/1-prep/tasks/computed_vars.yml +++ b/roles/1-prep/tasks/computed_vars.yml @@ -53,8 +53,6 @@ value: '{{ ansible_memtotal_mb }}' - option: 'swap_mb' value: '{{ ansible_swaptotal_mb }}' - - option: 'machine_id' - value: '{{ ansible_machine_id }}' - option: 'product_id' value: '{{ ansible_product_uuid }}' From 699fd961a03b522787617f6a4435295636926b0f Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 4 Sep 2016 03:49:22 +0000 Subject: [PATCH 3/9] In addition to these disabled items, it was a real challenge to get ansible running from github source. A lot of the dependencies needed to be compiled. First needed to get development tools, and some missing package-devels. Discovered that yumdownloader could be directged to epel noarch. That got pip very easily. Missing are NetworkManager, postgresql, mariadb, and desktop environments (think vnc) --- roles/0-once/tasks/cmdsrv.yml | 10 +++++----- roles/0-once/tasks/hw_rpi2.yml | 6 +++--- roles/0-once/tasks/yum.yml | 10 +++++----- roles/network/tasks/avahi.yml | 2 +- roles/network/tasks/main.yml | 8 ++++---- roles/network/tasks/restart.yml | 8 ++++---- roles/network/tasks/squid.yml | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/roles/0-once/tasks/cmdsrv.yml b/roles/0-once/tasks/cmdsrv.yml index e68080f3..595143de 100644 --- a/roles/0-once/tasks/cmdsrv.yml +++ b/roles/0-once/tasks/cmdsrv.yml @@ -10,8 +10,8 @@ state=installed with_items: - mod_ssl - - mod_authnz_external - - pwauth +# - mod_authnz_external +# - pwauth - name: Install packages for cmdsrv yum: name={{ item }} @@ -22,9 +22,9 @@ - php-devel - php-pear - python-devel - - python-pip - - zeromq3-devel - - cracklib-python +# - python-pip +# - zeromq3-devel +# - cracklib-python # - zeromq3 diff --git a/roles/0-once/tasks/hw_rpi2.yml b/roles/0-once/tasks/hw_rpi2.yml index 21840b1a..f45f8ce8 100644 --- a/roles/0-once/tasks/hw_rpi2.yml +++ b/roles/0-once/tasks/hw_rpi2.yml @@ -1,9 +1,9 @@ - name: Add a udev rule to transfer hwclock to system clock at dev creation template: src=92-rtc-i2c.rules dest=/etc/udev/rules.d/92-rtc-i2c.rules - owner:root - group:root - mode:0644 + owner=root + group=root + mode=0644 when: rtc_id is defined and rtc_id != "none" - name: Use compiled hostapd, and wpa_supplicant if tplink WM725M diff --git a/roles/0-once/tasks/yum.yml b/roles/0-once/tasks/yum.yml index 603e0734..7accf667 100644 --- a/roles/0-once/tasks/yum.yml +++ b/roles/0-once/tasks/yum.yml @@ -35,10 +35,10 @@ - acpid - mlocate - rsync - - htop - - etckeeper - - python-passlib - - usbmount +# - htop +# - etckeeper +# - python-passlib +# - usbmount - net-tools - openssh-server - sudo @@ -52,7 +52,7 @@ - i2c-tools - bridge-utils - usbutils - - hostapd +# - hostapd - wpa_supplicant - wget - openssl #FC 18 does not supply, but pear requires diff --git a/roles/network/tasks/avahi.yml b/roles/network/tasks/avahi.yml index c34efde3..d5ee36aa 100644 --- a/roles/network/tasks/avahi.yml +++ b/roles/network/tasks/avahi.yml @@ -2,7 +2,7 @@ yum: name={{ item }} state=present with_items: - - nss-mdns +# - nss-mdns - avahi - avahi-tools tags: diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 78e07d8a..a71b594c 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -119,7 +119,7 @@ tags: - network -- include: hostapd.yml - when: not installing - tags: - - network +#- include: hostapd.yml +# when: not installing +# tags: +# - network diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 82025a19..9397c476 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -15,10 +15,10 @@ ignore_errors: True when: named_enabled -- name: Stop dansguardian - service: name=dansguardian - state=stopped - when: not dansguardian_enabled +#- name: Stop dansguardian +# service: name=dansguardian +# state=stopped +# when: not dansguardian_enabled - name: Restart dansguardian service: name=dansguardian diff --git a/roles/network/tasks/squid.yml b/roles/network/tasks/squid.yml index 5729c69c..ffcfe3a6 100644 --- a/roles/network/tasks/squid.yml +++ b/roles/network/tasks/squid.yml @@ -3,8 +3,8 @@ state=installed with_items: - squid - - cadaver - - dansguardian +# - cadaver +# - dansguardian tags: - download @@ -60,7 +60,7 @@ mode=0750 state=directory -- include: dansguardian.yml +#- include: dansguardian.yml - name: Stop Squid service: name=squid From e1c7387bb60840e39a731da8b6bd841d543b9536 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 31 Aug 2016 10:46:27 -0400 Subject: [PATCH 4/9] moving mods to 0-once broke this --- roles/0-once/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/0-once/tasks/main.yml b/roles/0-once/tasks/main.yml index 075468fa..87ff272f 100644 --- a/roles/0-once/tasks/main.yml +++ b/roles/0-once/tasks/main.yml @@ -1,3 +1,8 @@ +- name: Set flag for fedora 18 + set_fact: + is_F18: True + when: ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18" + - include: selinux.yml when: ansible_selinux is defined and ansible_version >= '2' and ansible_selinux or ansible_selinux['status'] is defined and ansible_version < '2' and ansible_selinux['status'] != 'disabled' From 857c9fc54a0eaecca5bbd492bb4cfa58db5ca295 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 1 Sep 2016 12:52:20 -0400 Subject: [PATCH 5/9] f18 does not have ansible_machine_id --- roles/1-prep/tasks/computed_vars.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/1-prep/tasks/computed_vars.yml b/roles/1-prep/tasks/computed_vars.yml index 57375092..6712ad72 100644 --- a/roles/1-prep/tasks/computed_vars.yml +++ b/roles/1-prep/tasks/computed_vars.yml @@ -53,8 +53,6 @@ value: '{{ ansible_memtotal_mb }}' - option: 'swap_mb' value: '{{ ansible_swaptotal_mb }}' - - option: 'machine_id' - value: '{{ ansible_machine_id }}' - option: 'product_id' value: '{{ ansible_product_uuid }}' From 9603a9cf6e7a2a685c98fcc7679d64385efc0897 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 4 Sep 2016 03:49:22 +0000 Subject: [PATCH 6/9] In addition to these disabled items, it was a real challenge to get ansible running from github source. A lot of the dependencies needed to be compiled. First needed to get development tools, and some missing package-devels. Discovered that yumdownloader could be directged to epel noarch. That got pip very easily. Missing are NetworkManager, postgresql, mariadb, and desktop environments (think vnc) --- roles/0-once/tasks/cmdsrv.yml | 10 +++++----- roles/0-once/tasks/hw_rpi2.yml | 6 +++--- roles/0-once/tasks/yum.yml | 10 +++++----- roles/network/tasks/avahi.yml | 2 +- roles/network/tasks/main.yml | 8 ++++---- roles/network/tasks/restart.yml | 8 ++++---- roles/network/tasks/squid.yml | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/roles/0-once/tasks/cmdsrv.yml b/roles/0-once/tasks/cmdsrv.yml index a0d7752d..3bf11ba0 100644 --- a/roles/0-once/tasks/cmdsrv.yml +++ b/roles/0-once/tasks/cmdsrv.yml @@ -10,8 +10,8 @@ state=present with_items: - mod_ssl - - mod_authnz_external - - pwauth +# - mod_authnz_external +# - pwauth - name: Install packages for cmdsrv package: name={{ item }} @@ -22,9 +22,9 @@ - php-devel - php-pear - python-devel - - python-pip - - zeromq3-devel - - cracklib-python +# - python-pip +# - zeromq3-devel +# - cracklib-python # - zeromq3 diff --git a/roles/0-once/tasks/hw_rpi2.yml b/roles/0-once/tasks/hw_rpi2.yml index 21840b1a..f45f8ce8 100644 --- a/roles/0-once/tasks/hw_rpi2.yml +++ b/roles/0-once/tasks/hw_rpi2.yml @@ -1,9 +1,9 @@ - name: Add a udev rule to transfer hwclock to system clock at dev creation template: src=92-rtc-i2c.rules dest=/etc/udev/rules.d/92-rtc-i2c.rules - owner:root - group:root - mode:0644 + owner=root + group=root + mode=0644 when: rtc_id is defined and rtc_id != "none" - name: Use compiled hostapd, and wpa_supplicant if tplink WM725M diff --git a/roles/0-once/tasks/yum.yml b/roles/0-once/tasks/yum.yml index 603e0734..7accf667 100644 --- a/roles/0-once/tasks/yum.yml +++ b/roles/0-once/tasks/yum.yml @@ -35,10 +35,10 @@ - acpid - mlocate - rsync - - htop - - etckeeper - - python-passlib - - usbmount +# - htop +# - etckeeper +# - python-passlib +# - usbmount - net-tools - openssh-server - sudo @@ -52,7 +52,7 @@ - i2c-tools - bridge-utils - usbutils - - hostapd +# - hostapd - wpa_supplicant - wget - openssl #FC 18 does not supply, but pear requires diff --git a/roles/network/tasks/avahi.yml b/roles/network/tasks/avahi.yml index c34efde3..d5ee36aa 100644 --- a/roles/network/tasks/avahi.yml +++ b/roles/network/tasks/avahi.yml @@ -2,7 +2,7 @@ yum: name={{ item }} state=present with_items: - - nss-mdns +# - nss-mdns - avahi - avahi-tools tags: diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 78e07d8a..a71b594c 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -119,7 +119,7 @@ tags: - network -- include: hostapd.yml - when: not installing - tags: - - network +#- include: hostapd.yml +# when: not installing +# tags: +# - network diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 82025a19..9397c476 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -15,10 +15,10 @@ ignore_errors: True when: named_enabled -- name: Stop dansguardian - service: name=dansguardian - state=stopped - when: not dansguardian_enabled +#- name: Stop dansguardian +# service: name=dansguardian +# state=stopped +# when: not dansguardian_enabled - name: Restart dansguardian service: name=dansguardian diff --git a/roles/network/tasks/squid.yml b/roles/network/tasks/squid.yml index 5729c69c..ffcfe3a6 100644 --- a/roles/network/tasks/squid.yml +++ b/roles/network/tasks/squid.yml @@ -3,8 +3,8 @@ state=installed with_items: - squid - - cadaver - - dansguardian +# - cadaver +# - dansguardian tags: - download @@ -60,7 +60,7 @@ mode=0750 state=directory -- include: dansguardian.yml +#- include: dansguardian.yml - name: Stop Squid service: name=squid From 462feaf78ada0932c8cb64e06c4d6ddc06f7c19a Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 4 Sep 2016 03:49:22 +0000 Subject: [PATCH 7/9] In addition to these disabled items, it was a real challenge to get ansible running from github source. A lot of the dependencies needed to be compiled. First needed to get development tools, and some missing package-devels. Discovered that yumdownloader could be directged to epel noarch. That got pip very easily. Missing are NetworkManager, postgresql, mariadb, and desktop environments (think vnc) --- roles/0-once/tasks/cmdsrv.yml | 10 +++++----- roles/0-once/tasks/hw_rpi2.yml | 6 +++--- roles/0-once/tasks/yum.yml | 10 +++++----- roles/network/tasks/avahi.yml | 2 +- roles/network/tasks/main.yml | 8 ++++---- roles/network/tasks/restart.yml | 8 ++++---- roles/network/tasks/squid.yml | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/roles/0-once/tasks/cmdsrv.yml b/roles/0-once/tasks/cmdsrv.yml index a0d7752d..3bf11ba0 100644 --- a/roles/0-once/tasks/cmdsrv.yml +++ b/roles/0-once/tasks/cmdsrv.yml @@ -10,8 +10,8 @@ state=present with_items: - mod_ssl - - mod_authnz_external - - pwauth +# - mod_authnz_external +# - pwauth - name: Install packages for cmdsrv package: name={{ item }} @@ -22,9 +22,9 @@ - php-devel - php-pear - python-devel - - python-pip - - zeromq3-devel - - cracklib-python +# - python-pip +# - zeromq3-devel +# - cracklib-python # - zeromq3 diff --git a/roles/0-once/tasks/hw_rpi2.yml b/roles/0-once/tasks/hw_rpi2.yml index 21840b1a..f45f8ce8 100644 --- a/roles/0-once/tasks/hw_rpi2.yml +++ b/roles/0-once/tasks/hw_rpi2.yml @@ -1,9 +1,9 @@ - name: Add a udev rule to transfer hwclock to system clock at dev creation template: src=92-rtc-i2c.rules dest=/etc/udev/rules.d/92-rtc-i2c.rules - owner:root - group:root - mode:0644 + owner=root + group=root + mode=0644 when: rtc_id is defined and rtc_id != "none" - name: Use compiled hostapd, and wpa_supplicant if tplink WM725M diff --git a/roles/0-once/tasks/yum.yml b/roles/0-once/tasks/yum.yml index 603e0734..7accf667 100644 --- a/roles/0-once/tasks/yum.yml +++ b/roles/0-once/tasks/yum.yml @@ -35,10 +35,10 @@ - acpid - mlocate - rsync - - htop - - etckeeper - - python-passlib - - usbmount +# - htop +# - etckeeper +# - python-passlib +# - usbmount - net-tools - openssh-server - sudo @@ -52,7 +52,7 @@ - i2c-tools - bridge-utils - usbutils - - hostapd +# - hostapd - wpa_supplicant - wget - openssl #FC 18 does not supply, but pear requires diff --git a/roles/network/tasks/avahi.yml b/roles/network/tasks/avahi.yml index c34efde3..d5ee36aa 100644 --- a/roles/network/tasks/avahi.yml +++ b/roles/network/tasks/avahi.yml @@ -2,7 +2,7 @@ yum: name={{ item }} state=present with_items: - - nss-mdns +# - nss-mdns - avahi - avahi-tools tags: diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 78e07d8a..a71b594c 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -119,7 +119,7 @@ tags: - network -- include: hostapd.yml - when: not installing - tags: - - network +#- include: hostapd.yml +# when: not installing +# tags: +# - network diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 82025a19..9397c476 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -15,10 +15,10 @@ ignore_errors: True when: named_enabled -- name: Stop dansguardian - service: name=dansguardian - state=stopped - when: not dansguardian_enabled +#- name: Stop dansguardian +# service: name=dansguardian +# state=stopped +# when: not dansguardian_enabled - name: Restart dansguardian service: name=dansguardian diff --git a/roles/network/tasks/squid.yml b/roles/network/tasks/squid.yml index 5729c69c..ffcfe3a6 100644 --- a/roles/network/tasks/squid.yml +++ b/roles/network/tasks/squid.yml @@ -3,8 +3,8 @@ state=installed with_items: - squid - - cadaver - - dansguardian +# - cadaver +# - dansguardian tags: - download @@ -60,7 +60,7 @@ mode=0750 state=directory -- include: dansguardian.yml +#- include: dansguardian.yml - name: Stop Squid service: name=squid From f774157b88cc180ca5c896312146d315027f2a18 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 4 Sep 2016 04:42:09 +0000 Subject: [PATCH 8/9] disable openvpn --- roles/4-server-options/meta/main.yml | 2 +- roles/openvpn/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/4-server-options/meta/main.yml b/roles/4-server-options/meta/main.yml index bd4abba3..12686311 100644 --- a/roles/4-server-options/meta/main.yml +++ b/roles/4-server-options/meta/main.yml @@ -3,7 +3,7 @@ dependencies: - { role: network, tags: ['services','base','network'], when: gui_desired_network_role is defined } - { role: postgresql, tags: ['services','postgresql','base'], when: postgresql_install } - { role: authserver, tags: ['services','authserver','base'], when: authserver_install } - - { role: openvpn, tags: ['options','openvpn'], when: openvpn_install } +# - { role: openvpn, tags: ['options','openvpn'], when: openvpn_install } - { role: samba, tags: ['services','samba','options'], when: samba_install } - { role: usb-lib, tags: ['services','usb-lib','options'], when: usb_lib_install } - { role: cups, tags: ['services','cups','options'], when: cups_install } diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index 916489c3..87ca8f64 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -4,7 +4,7 @@ yum: name={{ item }} state=present with_items: - - openvpn +# - openvpn - nmap tags: - download From 12257c11351565711ff4a3a643e593cd52336409 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 4 Sep 2016 04:52:51 +0000 Subject: [PATCH 9/9] add in local vars for copying to ease setup when many packages do not exist --- vars/local_vars.yml.centos | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 vars/local_vars.yml.centos diff --git a/vars/local_vars.yml.centos b/vars/local_vars.yml.centos new file mode 100644 index 00000000..95463f96 --- /dev/null +++ b/vars/local_vars.yml.centos @@ -0,0 +1,26 @@ +# Put variables for your installation that override defaults here +# Better still, put this file in a branch of https://github.com/XSCE/xsce-local for your deployment + +#xsce_admin_user: xsce-admin + +# obtain a password hash with - python -c 'import crypt; print crypt.crypt("", "$6$<salt>")' +#xsce_admin_passw_hash: +varible: value +openvpn_install: False +dansguardian_install: False +dansguardian_enabled: False +authserver_install: False +authserver_enabled: False +# 5-xoservices +xo_services_install: False +ejabberd_install: False +idmgr_install: False +# 6-generic-aps +# 7-edu-aps +pathagar_install: False +# 8-mgmat-tools +sugar_stats_install: False +ajenti_install: False +monit_install: False +xovis_install: False +teamviewer_install: False