Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arm centos #789

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions roles/0-once/tasks/cmdsrv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -22,9 +22,9 @@
- php-devel
- php-pear
- python-devel
- python-pip
- zeromq3-devel
- cracklib-python
# - python-pip
# - zeromq3-devel
# - cracklib-python

# - zeromq3

Expand Down
6 changes: 3 additions & 3 deletions roles/0-once/tasks/hw_rpi2.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions roles/0-once/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
10 changes: 5 additions & 5 deletions roles/0-once/tasks/yum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
- acpid
- mlocate
- rsync
- htop
- etckeeper
- python-passlib
- usbmount
# - htop
# - etckeeper
# - python-passlib
# - usbmount
- net-tools
- openssh-server
- sudo
Expand All @@ -52,7 +52,7 @@
- i2c-tools
- bridge-utils
- usbutils
- hostapd
# - hostapd
- wpa_supplicant
- wget
- openssl #FC 18 does not supply, but pear requires
Expand Down
2 changes: 0 additions & 2 deletions roles/1-prep/tasks/computed_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'

Expand Down
2 changes: 1 addition & 1 deletion roles/4-server-options/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
2 changes: 1 addition & 1 deletion roles/network/tasks/avahi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
yum: name={{ item }}
state=present
with_items:
- nss-mdns
# - nss-mdns
- avahi
- avahi-tools
tags:
Expand Down
8 changes: 4 additions & 4 deletions roles/network/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
tags:
- network

- include: hostapd.yml
when: not installing
tags:
- network
#- include: hostapd.yml
# when: not installing
# tags:
# - network
8 changes: 4 additions & 4 deletions roles/network/tasks/restart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions roles/network/tasks/squid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
state=installed
with_items:
- squid
- cadaver
- dansguardian
# - cadaver
# - dansguardian
tags:
- download

Expand Down Expand Up @@ -60,7 +60,7 @@
mode=0750
state=directory

- include: dansguardian.yml
#- include: dansguardian.yml

- name: Stop Squid
service: name=squid
Expand Down
2 changes: 1 addition & 1 deletion roles/openvpn/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
yum: name={{ item }}
state=present
with_items:
- openvpn
# - openvpn
- nmap
tags:
- download
Expand Down
26 changes: 26 additions & 0 deletions vars/local_vars.yml.centos
Original file line number Diff line number Diff line change
@@ -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("<plaintext>", "$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