external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Remove tags in ~30 files, improve verbiage

Browse source
This commit is contained in:
root 2020-01-30 04:57:53 -05:00
parent 814efd5a02
commit 2cdf846365
30 changed files with 11 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

1
roles/0-DEPRECATED-ROLES/docker/tasks/main.yml
View file

@ -5,7 +5,6 @@
- docker - docker
- python-docker-py - python-docker-py
when: docker_install | bool when: docker_install | bool
#tags: download
- name: put the systemd startup file in place - name: put the systemd startup file in place
template: src=docker.service template: src=docker.service

1
roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml
View file

@ -2,7 +2,6 @@
package: package:
name: ejabberd name: ejabberd
state: present state: present
#tags: download
#- name: Configure ejabberd #- name: Configure ejabberd
# template: # template:

1
roles/0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml
View file

@ -3,7 +3,6 @@
state=present state=present
with_items: with_items:
- ejabberd-2.1.11 - ejabberd-2.1.11
#tags: download
when: not is_debuntu when: not is_debuntu
# need to use lineinfile and better regexp # need to use lineinfile and better regexp

1
roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml
View file

@ -7,7 +7,6 @@
- xinetd - xinetd
- xs-rsync - xs-rsync
- incron - incron
#tags: download
- name: Configure idmgr - name: Configure idmgr
template: backup=yes template: backup=yes

1
roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml
View file

@ -6,7 +6,6 @@
- active-document - active-document
- restful-document - restful-document
- python-xappy - python-xappy
#tags: download
- name: Create sugar-stats directory tree - name: Create sugar-stats directory tree
file: path={{ item }} file: path={{ item }}

5
roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml
View file

@ -2,22 +2,18 @@
- name: Install Xfce group of packages - name: Install Xfce group of packages
shell: "yum groupinstall -y xfce" shell: "yum groupinstall -y xfce"
when: xo_model == "none" and internet_available and ansible_distribution_version <= "20" when: xo_model == "none" and internet_available and ansible_distribution_version <= "20"
#tags: download
- name: Install X11 group of packages - name: Install X11 group of packages
shell: "yum groupinstall -y 'X Window system'" shell: "yum groupinstall -y 'X Window system'"
when: xo_model == "none" and internet_available and ansible_distribution_version <= "20" when: xo_model == "none" and internet_available and ansible_distribution_version <= "20"
#tags: download
- name: Install Xfce group of packages - name: Install Xfce group of packages
shell: yum groupinstall -y "Xfce Desktop" --exclude fedora-release\* shell: yum groupinstall -y "Xfce Desktop" --exclude fedora-release\*
when: xo_model == "none" and internet_available and ansible_distribution_version >= "21" when: xo_model == "none" and internet_available and ansible_distribution_version >= "21"
#tags: download
- name: Install X Windows on CentOS - name: Install X Windows on CentOS
shell: yum groupinstall -y "Server with GUI" shell: yum groupinstall -y "Server with GUI"
when: internet_available and ansible_distribution == "CentOS" when: internet_available and ansible_distribution == "CentOS"
#tags: download
- name: Download TeamViewer software - name: Download TeamViewer software
get_url: get_url:
@ -25,7 +21,6 @@
dest: "{{ yum_packages_dir }}/{{ teamviewer_rpm_file }}" dest: "{{ yum_packages_dir }}/{{ teamviewer_rpm_file }}"
timeout: "{{ download_timeout }}" timeout: "{{ download_timeout }}"
when: internet_available | bool when: internet_available | bool
#tags: download
# F22 has issues with yum localinstall exclude for now # F22 has issues with yum localinstall exclude for now
- name: Do the install of TeamViewer, pulling in any required dependencies - name: Do the install of TeamViewer, pulling in any required dependencies

2
roles/2-common/tasks/iptables.yml
View file

@ -31,14 +31,12 @@
name: iptables-persistent name: iptables-persistent
state: present state: present
when: is_debuntu | bool when: is_debuntu | bool
#tags: download
- name: Install package iptables-services (OS's other than debuntu) - name: Install package iptables-services (OS's other than debuntu)
package: package:
name: iptables-services name: iptables-services
state: present state: present
when: not is_debuntu when: not is_debuntu
#tags: download
- name: Install /etc/sysconfig/iptables-config from template - name: Install /etc/sysconfig/iptables-config from template
template: template:

1
roles/2-common/tasks/xo.yml
View file

@ -132,7 +132,6 @@
with_items: with_items:
- hostapd_8188_i386 - hostapd_8188_i386
when: wifi_id == "tplink_WM725M" and xo_model == "XO-1.5" and internet_available when: wifi_id == "tplink_WM725M" and xo_model == "XO-1.5" and internet_available
#tags: xo
- name: Put the substitute in place - name: Put the substitute in place
copy: copy:

1
roles/all-vars/tasks/main.yml
View file

@ -11,4 +11,3 @@
debug: debug:
msg: "{{ msg.split('\n') }}" msg: "{{ msg.split('\n') }}"
#tags: debug_info

2
roles/awstats/tasks/enable.yml
View file

@ -49,7 +49,7 @@
value: AWStats value: AWStats
- option: description - option: description
value: '"AWStats (originally known as Advanced Web Statistics) is a package written in Perl which generates static or dynamic html summaries based upon web server logs."' value: '"AWStats (originally known as Advanced Web Statistics) is a package written in Perl which generates static or dynamic html summaries based upon web server logs."'
- option: installed - option: install
value: "{{ awstats_install }}" value: "{{ awstats_install }}"
- option: enabled - option: enabled
value: "{{ awstats_enabled }}" value: "{{ awstats_enabled }}"

6
roles/calibre-web/tasks/install.yml
View file

@ -64,9 +64,9 @@
template: template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
owner: root # owner: root
group: root # group: root
mode: '0644' # mode: '0644'
with_items: with_items:
- { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service' } - { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service' }
- { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf' } - { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf' }

2
roles/captiveportal/tasks/main.yml
View file

@ -39,7 +39,7 @@
value: Captive Portal value: Captive Portal
- option: description - option: description
value: '"Captive Portal tries to open the browser automatically, so users don''t have to type in URL''s like http://box.lan in support of kiosk-like situations, in multilingual and less literate communities."' value: '"Captive Portal tries to open the browser automatically, so users don''t have to type in URL''s like http://box.lan in support of kiosk-like situations, in multilingual and less literate communities."'
- option: installed - option: install
value: "{{ captiveportal_install }}" value: "{{ captiveportal_install }}"
- option: enabled - option: enabled
value: "{{ captiveportal_enabled }}" value: "{{ captiveportal_enabled }}"

2
roles/cups/tasks/main.yml
View file

@ -61,7 +61,7 @@
enabled: yes enabled: yes
when: cups_enabled and is_F18 when: cups_enabled and is_F18
- name: Permit headless admin of CUPS -- only works when CUPS daemon is running, if cups_enabled - name: Permit headless admin of CUPS -- only works when CUPS daemon is running (if cups_enabled)
shell: "cupsctl --remote-admin" shell: "cupsctl --remote-admin"
when: cups_enabled | bool when: cups_enabled | bool

1
roles/gitea/tasks/install.yml
View file

@ -47,7 +47,6 @@
url: "{{ gitea_download_url }}" url: "{{ gitea_download_url }}"
dest: "{{ gitea_install_path }}" dest: "{{ gitea_install_path }}"
mode: '0775' mode: '0775'
#tags: install
when: internet_available | bool when: internet_available | bool
- name: Download Gitea GPG signature - name: Download Gitea GPG signature

3
roles/httpd/tasks/install.yml
View file

@ -8,7 +8,6 @@
- "php{{ php_version }}-curl" - "php{{ php_version }}-curl"
state: present state: present
when: is_debian | bool when: is_debian | bool
#tags: download
- name: 'Install 2 packages: apache2, php (ubuntu)' - name: 'Install 2 packages: apache2, php (ubuntu)'
package: package:
@ -19,7 +18,6 @@
- php - php
state: present state: present
when: is_ubuntu | bool when: is_ubuntu | bool
#tags: download
# 2019-05-30: It's interesting that http://box.lan/admin and everything seems # 2019-05-30: It's interesting that http://box.lan/admin and everything seems
# to work even without php{{ php_version }}-sqlite3 as confirmed on Ubuntu # to work even without php{{ php_version }}-sqlite3 as confirmed on Ubuntu
@ -50,7 +48,6 @@
- php-curl - php-curl
state: present state: present
when: is_redhat | bool when: is_redhat | bool
#tags: download
# remove symlinks for mpm-event, replace with mpm-prefork # remove symlinks for mpm-event, replace with mpm-prefork
- name: Remove both mpm_event symlinks from /etc/apache2/mods-enabled (debuntu) - name: Remove both mpm_event symlinks from /etc/apache2/mods-enabled (debuntu)

1
roles/iiab-admin/tasks/access.yml
View file

@ -4,4 +4,3 @@
- screen - screen
- lynx - lynx
state: present state: present
#tags: download

2
roles/iiab-admin/tasks/main.yml
View file

@ -1,9 +1,7 @@
- include_tasks: admin-user.yml - include_tasks: admin-user.yml
#tags: base
when: iiab_admin_user_install | bool when: iiab_admin_user_install | bool
- include_tasks: access.yml - include_tasks: access.yml
#tags: base
- name: Add 'iiab-admin' variable values to {{ iiab_ini_file }} - name: Add 'iiab-admin' variable values to {{ iiab_ini_file }}
ini_file: ini_file:

2
roles/internetarchive/tasks/enable.yml
View file

@ -42,6 +42,6 @@
- option: name - option: name
value: Internet Archive value: Internet Archive
- option: description - option: description
value: '"Dweb-mirror is intended to make the Internet Archive experience and UI available offline."' value: '"Take the Internet Archive experience and materials offline, in a decentralized way!"'
- option: internetarchive_enabled - option: internetarchive_enabled
value: "{{ internetarchive_enabled }}" value: "{{ internetarchive_enabled }}"

1
roles/mongodb/tasks/install.yml
View file

@ -7,7 +7,6 @@
- mongodb # 2019-01-31: this package does not exist on (cannot be installed on) Debian 10, SEE #1437 - mongodb # 2019-01-31: this package does not exist on (cannot be installed on) Debian 10, SEE #1437
state: present state: present
when: internet_available and not is_rpi when: internet_available and not is_rpi
#tags: download
# 2019-02-02: Sugarizer with Node.js 10.x requires MongoDB 2.6+ so # 2019-02-02: Sugarizer with Node.js 10.x requires MongoDB 2.6+ so
# https://andyfelong.com/2017/08/mongodb-3-0-14-for-raspbian-stretch/ # https://andyfelong.com/2017/08/mongodb-3-0-14-for-raspbian-stretch/

2
roles/monit/tasks/install.yml
View file

@ -2,14 +2,12 @@
package: package:
name: monit name: monit
state: present state: present
#tags: download
- name: Install chkconfig package (debian-8) - name: Install chkconfig package (debian-8)
package: package:
name: chkconfig name: chkconfig
state: present state: present
when: is_debian and ansible_distribution_major_version == "8" when: is_debian and ansible_distribution_major_version == "8"
#tags: download
- name: Install /etc/monitrc from template - name: Install /etc/monitrc from template
template: template:

1
roles/mosquitto/tasks/install.yml
View file

@ -5,7 +5,6 @@
with_items: with_items:
- mosquitto - mosquitto
- mosquitto-clients - mosquitto-clients
#tags: download
- name: Disable & Stop 'mosquitto' service - name: Disable & Stop 'mosquitto' service
systemd: systemd:

2
roles/munin/tasks/main.yml
View file

@ -59,7 +59,7 @@
value: Munin value: Munin
- option: description - option: description
value: '"Munin is a networked resource monitoring tool that can help analyze resource trends and ''what just happened to kill our performance?'' problems."' value: '"Munin is a networked resource monitoring tool that can help analyze resource trends and ''what just happened to kill our performance?'' problems."'
- option: installed - option: install
value: "{{ munin_install }}" value: "{{ munin_install }}"
- option: enabled - option: enabled
value: "{{ munin_enabled }}" value: "{{ munin_enabled }}"

2
roles/network/tasks/computed_network.yml
View file

@ -178,7 +178,6 @@
regexp: '^IIAB_WAN_DEVICE=*' regexp: '^IIAB_WAN_DEVICE=*'
line: 'IIAB_WAN_DEVICE="{{ iiab_wan_iface }}"' line: 'IIAB_WAN_DEVICE="{{ iiab_wan_iface }}"'
when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml
#tags: network
- name: Record IIAB_LAN_DEVICE to {{ iiab_env_file }} - name: Record IIAB_LAN_DEVICE to {{ iiab_env_file }}
lineinfile: lineinfile:
@ -187,7 +186,6 @@
line: 'IIAB_LAN_DEVICE="{{ iiab_lan_iface }}"' line: 'IIAB_LAN_DEVICE="{{ iiab_lan_iface }}"'
state: present state: present
when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml
#tags: network
- name: Add 'computed_network' variable values to {{ iiab_ini_file }} - name: Add 'computed_network' variable values to {{ iiab_ini_file }}
ini_file: ini_file:

1
roles/network/tasks/dansguardian.yml
View file

@ -2,7 +2,6 @@
package: package:
name: dansguardian name: dansguardian
state: present state: present
#tags: download
- name: Install /etc/dansguardian/dansguardian.conf from template (Fedora) - name: Install /etc/dansguardian/dansguardian.conf from template (Fedora)
template: template:

1
roles/network/tasks/ifcfg_mods.yml
View file

@ -84,7 +84,6 @@
src: network/wifi-slave.j2 src: network/wifi-slave.j2
dest: "/etc/sysconfig/network-scripts/ifcfg-{{ iiab_wireless_lan_iface }}" dest: "/etc/sysconfig/network-scripts/ifcfg-{{ iiab_wireless_lan_iface }}"
when: iiab_lan_iface == "br0" and iiab_wireless_lan_iface != "none" when: iiab_lan_iface == "br0" and iiab_wireless_lan_iface != "none"
#tags: network
- include_tasks: enable_wan.yml - include_tasks: enable_wan.yml
when: not installing and not iiab_demo_mode when: not installing and not iiab_demo_mode

15
roles/network/tasks/main.yml
View file

@ -1,6 +1,5 @@
- include_tasks: detected_network.yml - include_tasks: detected_network.yml
when: not installing # REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml when: not installing # REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml
#tags: network, network-discover # REMOVE SUCH LINES (BELOW TOO) AS WE'RE IN "network" ?
- name: IF WIFI IS PRIMARY GATEWAY, PLEASE RUN 'iiab-hotspot-on' MANUALLY - name: IF WIFI IS PRIMARY GATEWAY, PLEASE RUN 'iiab-hotspot-on' MANUALLY
set_fact: set_fact:
@ -27,10 +26,8 @@
- include_tasks: computed_network.yml - include_tasks: computed_network.yml
when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml
#tags: network, network-discover
- include_tasks: hostapd.yml - include_tasks: hostapd.yml
#tags: network, AP
#- name: RPi - don't reboot to AP post install - installed via wifi - don't blow away current network #- name: RPi - don't reboot to AP post install - installed via wifi - don't blow away current network
# set_fact: # set_fact:
@ -44,12 +41,10 @@
##### End static ip address info ##### End static ip address info
#- include_tasks: hosts.yml #- include_tasks: hosts.yml
# tags: network, hostname, domain
- name: Configure wondershaper - name: Configure wondershaper
include_tasks: wondershaper.yml include_tasks: wondershaper.yml
when: wondershaper_install or wondershaper_installed is defined when: wondershaper_install or wondershaper_installed is defined
#tags: network, wondershaper
- name: (Re)Install named - name: (Re)Install named
include_tasks: named.yml include_tasks: named.yml
@ -65,13 +60,10 @@
#### start services #### start services
- include_tasks: avahi.yml - include_tasks: avahi.yml
#tags: network
- include_tasks: computed_services.yml - include_tasks: computed_services.yml
#tags: network, named, dhcpd, dnsmasq, squid
- include_tasks: enable_services.yml - include_tasks: enable_services.yml
#tags: network, named, dhcpd, dnsmasq, squid
#### end services #### end services
#### Start network layout #### Start network layout
@ -79,40 +71,33 @@
include_tasks: ifcfg_mods.yml include_tasks: ifcfg_mods.yml
when: is_redhat | bool when: is_redhat | bool
#and not installing #and not installing
#tags: network
- name: Netplan in use on Ubuntu 18.04+ - name: Netplan in use on Ubuntu 18.04+
include_tasks: netplan.yml include_tasks: netplan.yml
when: is_ubuntu and not is_ubuntu_16 when: is_ubuntu and not is_ubuntu_16
#when: is_ubuntu_18 | bool #when: is_ubuntu_18 | bool
#and not installing #and not installing
#tags: network
- name: NetworkManager in use - name: NetworkManager in use
include_tasks: NM-debian.yml include_tasks: NM-debian.yml
when: is_debuntu and network_manager_active when: is_debuntu and network_manager_active
#and not installing #and not installing
#tags: network
- name: systemd-networkd in use - name: systemd-networkd in use
include_tasks: sysd-netd-debian.yml include_tasks: sysd-netd-debian.yml
when: is_debuntu and systemd_networkd_active when: is_debuntu and systemd_networkd_active
#and not installing #and not installing
#tags: network
- name: RPi's have dhcpcd in use - name: RPi's have dhcpcd in use
include_tasks: rpi_debian.yml include_tasks: rpi_debian.yml
when: is_debuntu and is_rpi when: is_debuntu and is_rpi
#and not installing #and not installing
#tags: network
- name: Not RPi, Not NetworkManager, Not systemd-networkd in use - name: Not RPi, Not NetworkManager, Not systemd-networkd in use
include_tasks: debian.yml include_tasks: debian.yml
when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16 when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16
#and not installing #and not installing
#tags: network
#### end network layout #### end network layout
- include_tasks: restart.yml - include_tasks: restart.yml
when: not installing when: not installing
#tags: network, named, dhcpd, dnsmasq, squid, AP

2
roles/osm-vector-maps/tasks/main.yml
View file

@ -43,7 +43,7 @@
value: OSM Vector Maps value: OSM Vector Maps
- option: description - option: description
value: '"OpenStreetMap is like Google Maps but better, for schools especially, as it works offline and avoids all the advertising. Download detailed ''vector maps'' for an entire continent, or the entire world! Also includes 10+ zoom levels of satellite imagery!"' value: '"OpenStreetMap is like Google Maps but better, for schools especially, as it works offline and avoids all the advertising. Download detailed ''vector maps'' for an entire continent, or the entire world! Also includes 10+ zoom levels of satellite imagery!"'
- option: installed - option: install
value: "{{ osm_vector_maps_install }}" value: "{{ osm_vector_maps_install }}"
- option: enabled - option: enabled
value: "{{ osm_vector_maps_enabled }}" value: "{{ osm_vector_maps_enabled }}"

2
roles/postgresql/tasks/main.yml
View file

@ -125,7 +125,7 @@
value: PostgreSQL value: PostgreSQL
- option: description - option: description
value: '"PostgreSQL is a powerful, open source object-relational database system."' value: '"PostgreSQL is a powerful, open source object-relational database system."'
- option: installed - option: install
value: "{{ postgresql_install }}" value: "{{ postgresql_install }}"
- option: enabled - option: enabled
value: "{{ postgresql_enabled }}" value: "{{ postgresql_enabled }}"

1
roles/sugarizer/tasks/install.yml
View file

@ -2,7 +2,6 @@
- debug: - debug:
var: nodejs_install var: nodejs_install
- debug: - debug:
var: nodejs_enabled var: nodejs_enabled

3
roles/vnstat/tasks/main.yml
View file

@ -2,7 +2,6 @@
package: package:
name: vnstat name: vnstat
state: present state: present
#tags: download
- name: Install /etc/vnstat.conf from template - name: Install /etc/vnstat.conf from template
template: template:
@ -53,7 +52,7 @@
value: vnStat value: vnStat
- option: description - option: description
value: '"vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log of network traffic for the selected interface(s)."' value: '"vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log of network traffic for the selected interface(s)."'
- option: installed - option: install
value: "{{ vnstat_install }}" value: "{{ vnstat_install }}"
- option: enabled - option: enabled
value: "{{ vnstat_enabled }}" value: "{{ vnstat_enabled }}"