mirror of
https://github.com/iiab/iiab.git
synced 2025-02-12 11:12:06 +00:00
Remove tags in ~30 files, improve verbiage
This commit is contained in:
root
parent
814efd5a02
commit
2cdf846365
30 changed files with 11 additions and 57 deletions
|
|
@ -5,7 +5,6 @@
|
|||
- docker
|
||||
- python-docker-py
|
||||
when: docker_install | bool
|
||||
#tags: download
|
||||
|
||||
- name: put the systemd startup file in place
|
||||
template: src=docker.service
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
package:
|
||||
name: ejabberd
|
||||
state: present
|
||||
#tags: download
|
||||
|
||||
#- name: Configure ejabberd
|
||||
# template:
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
state=present
|
||||
with_items:
|
||||
- ejabberd-2.1.11
|
||||
#tags: download
|
||||
when: not is_debuntu
|
||||
|
||||
# need to use lineinfile and better regexp
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
- xinetd
|
||||
- xs-rsync
|
||||
- incron
|
||||
#tags: download
|
||||
|
||||
- name: Configure idmgr
|
||||
template: backup=yes
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
- active-document
|
||||
- restful-document
|
||||
- python-xappy
|
||||
#tags: download
|
||||
|
||||
- name: Create sugar-stats directory tree
|
||||
file: path={{ item }}
|
||||
|
|
|
|||
|
|
@ -2,22 +2,18 @@
|
|||
- name: Install Xfce group of packages
|
||||
shell: "yum groupinstall -y xfce"
|
||||
when: xo_model == "none" and internet_available and ansible_distribution_version <= "20"
|
||||
#tags: download
|
||||
|
||||
- name: Install X11 group of packages
|
||||
shell: "yum groupinstall -y 'X Window system'"
|
||||
when: xo_model == "none" and internet_available and ansible_distribution_version <= "20"
|
||||
#tags: download
|
||||
|
||||
- name: Install Xfce group of packages
|
||||
shell: yum groupinstall -y "Xfce Desktop" --exclude fedora-release\*
|
||||
when: xo_model == "none" and internet_available and ansible_distribution_version >= "21"
|
||||
#tags: download
|
||||
|
||||
- name: Install X Windows on CentOS
|
||||
shell: yum groupinstall -y "Server with GUI"
|
||||
when: internet_available and ansible_distribution == "CentOS"
|
||||
#tags: download
|
||||
|
||||
- name: Download TeamViewer software
|
||||
get_url:
|
||||
|
|
@ -25,7 +21,6 @@
|
|||
dest: "{{ yum_packages_dir }}/{{ teamviewer_rpm_file }}"
|
||||
timeout: "{{ download_timeout }}"
|
||||
when: internet_available | bool
|
||||
#tags: download
|
||||
|
||||
# F22 has issues with yum localinstall exclude for now
|
||||
- name: Do the install of TeamViewer, pulling in any required dependencies
|
||||
|
|
|
|||
|
|
@ -31,14 +31,12 @@
|
|||
name: iptables-persistent
|
||||
state: present
|
||||
when: is_debuntu | bool
|
||||
#tags: download
|
||||
|
||||
- name: Install package iptables-services (OS's other than debuntu)
|
||||
package:
|
||||
name: iptables-services
|
||||
state: present
|
||||
when: not is_debuntu
|
||||
#tags: download
|
||||
|
||||
- name: Install /etc/sysconfig/iptables-config from template
|
||||
template:
|
||||
|
|
|
|||
|
|
@ -132,7 +132,6 @@
|
|||
with_items:
|
||||
- hostapd_8188_i386
|
||||
when: wifi_id == "tplink_WM725M" and xo_model == "XO-1.5" and internet_available
|
||||
#tags: xo
|
||||
|
||||
- name: Put the substitute in place
|
||||
copy:
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@
|
|||
|
||||
debug:
|
||||
msg: "{{ msg.split('\n') }}"
|
||||
#tags: debug_info
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
value: AWStats
|
||||
- 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."'
|
||||
- option: installed
|
||||
- option: install
|
||||
value: "{{ awstats_install }}"
|
||||
- option: enabled
|
||||
value: "{{ awstats_enabled }}"
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@
|
|||
template:
|
||||
src: "{{ item.src }}"
|
||||
dest: "{{ item.dest }}"
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
# owner: root
|
||||
# group: root
|
||||
# mode: '0644'
|
||||
with_items:
|
||||
- { 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' }
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
value: Captive Portal
|
||||
- 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."'
|
||||
- option: installed
|
||||
- option: install
|
||||
value: "{{ captiveportal_install }}"
|
||||
- option: enabled
|
||||
value: "{{ captiveportal_enabled }}"
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
enabled: yes
|
||||
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"
|
||||
when: cups_enabled | bool
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@
|
|||
url: "{{ gitea_download_url }}"
|
||||
dest: "{{ gitea_install_path }}"
|
||||
mode: '0775'
|
||||
#tags: install
|
||||
when: internet_available | bool
|
||||
|
||||
- name: Download Gitea GPG signature
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
- "php{{ php_version }}-curl"
|
||||
state: present
|
||||
when: is_debian | bool
|
||||
#tags: download
|
||||
|
||||
- name: 'Install 2 packages: apache2, php (ubuntu)'
|
||||
package:
|
||||
|
|
@ -19,7 +18,6 @@
|
|||
- php
|
||||
state: present
|
||||
when: is_ubuntu | bool
|
||||
#tags: download
|
||||
|
||||
# 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
|
||||
|
|
@ -50,7 +48,6 @@
|
|||
- php-curl
|
||||
state: present
|
||||
when: is_redhat | bool
|
||||
#tags: download
|
||||
|
||||
# remove symlinks for mpm-event, replace with mpm-prefork
|
||||
- name: Remove both mpm_event symlinks from /etc/apache2/mods-enabled (debuntu)
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@
|
|||
- screen
|
||||
- lynx
|
||||
state: present
|
||||
#tags: download
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
- include_tasks: admin-user.yml
|
||||
#tags: base
|
||||
when: iiab_admin_user_install | bool
|
||||
|
||||
- include_tasks: access.yml
|
||||
#tags: base
|
||||
|
||||
- name: Add 'iiab-admin' variable values to {{ iiab_ini_file }}
|
||||
ini_file:
|
||||
|
|
|
|||
|
|
@ -42,6 +42,6 @@
|
|||
- option: name
|
||||
value: Internet Archive
|
||||
- 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
|
||||
value: "{{ internetarchive_enabled }}"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
- mongodb # 2019-01-31: this package does not exist on (cannot be installed on) Debian 10, SEE #1437
|
||||
state: present
|
||||
when: internet_available and not is_rpi
|
||||
#tags: download
|
||||
|
||||
# 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/
|
||||
|
|
|
|||
|
|
@ -2,14 +2,12 @@
|
|||
package:
|
||||
name: monit
|
||||
state: present
|
||||
#tags: download
|
||||
|
||||
- name: Install chkconfig package (debian-8)
|
||||
package:
|
||||
name: chkconfig
|
||||
state: present
|
||||
when: is_debian and ansible_distribution_major_version == "8"
|
||||
#tags: download
|
||||
|
||||
- name: Install /etc/monitrc from template
|
||||
template:
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
with_items:
|
||||
- mosquitto
|
||||
- mosquitto-clients
|
||||
#tags: download
|
||||
|
||||
- name: Disable & Stop 'mosquitto' service
|
||||
systemd:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
value: Munin
|
||||
- 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."'
|
||||
- option: installed
|
||||
- option: install
|
||||
value: "{{ munin_install }}"
|
||||
- option: enabled
|
||||
value: "{{ munin_enabled }}"
|
||||
|
|
|
|||
|
|
@ -178,7 +178,6 @@
|
|||
regexp: '^IIAB_WAN_DEVICE=*'
|
||||
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
|
||||
#tags: network
|
||||
|
||||
- name: Record IIAB_LAN_DEVICE to {{ iiab_env_file }}
|
||||
lineinfile:
|
||||
|
|
@ -187,7 +186,6 @@
|
|||
line: 'IIAB_LAN_DEVICE="{{ iiab_lan_iface }}"'
|
||||
state: present
|
||||
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 }}
|
||||
ini_file:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
package:
|
||||
name: dansguardian
|
||||
state: present
|
||||
#tags: download
|
||||
|
||||
- name: Install /etc/dansguardian/dansguardian.conf from template (Fedora)
|
||||
template:
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@
|
|||
src: network/wifi-slave.j2
|
||||
dest: "/etc/sysconfig/network-scripts/ifcfg-{{ iiab_wireless_lan_iface }}"
|
||||
when: iiab_lan_iface == "br0" and iiab_wireless_lan_iface != "none"
|
||||
#tags: network
|
||||
|
||||
- include_tasks: enable_wan.yml
|
||||
when: not installing and not iiab_demo_mode
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
- 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
|
||||
#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
|
||||
set_fact:
|
||||
|
|
@ -27,10 +26,8 @@
|
|||
|
||||
- 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
|
||||
#tags: network, network-discover
|
||||
|
||||
- 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
|
||||
# set_fact:
|
||||
|
|
@ -44,12 +41,10 @@
|
|||
##### End static ip address info
|
||||
|
||||
#- include_tasks: hosts.yml
|
||||
# tags: network, hostname, domain
|
||||
|
||||
- name: Configure wondershaper
|
||||
include_tasks: wondershaper.yml
|
||||
when: wondershaper_install or wondershaper_installed is defined
|
||||
#tags: network, wondershaper
|
||||
|
||||
- name: (Re)Install named
|
||||
include_tasks: named.yml
|
||||
|
|
@ -65,13 +60,10 @@
|
|||
|
||||
#### start services
|
||||
- include_tasks: avahi.yml
|
||||
#tags: network
|
||||
|
||||
- include_tasks: computed_services.yml
|
||||
#tags: network, named, dhcpd, dnsmasq, squid
|
||||
|
||||
- include_tasks: enable_services.yml
|
||||
#tags: network, named, dhcpd, dnsmasq, squid
|
||||
|
||||
#### end services
|
||||
#### Start network layout
|
||||
|
|
@ -79,40 +71,33 @@
|
|||
include_tasks: ifcfg_mods.yml
|
||||
when: is_redhat | bool
|
||||
#and not installing
|
||||
#tags: network
|
||||
|
||||
- name: Netplan in use on Ubuntu 18.04+
|
||||
include_tasks: netplan.yml
|
||||
when: is_ubuntu and not is_ubuntu_16
|
||||
#when: is_ubuntu_18 | bool
|
||||
#and not installing
|
||||
#tags: network
|
||||
|
||||
- name: NetworkManager in use
|
||||
include_tasks: NM-debian.yml
|
||||
when: is_debuntu and network_manager_active
|
||||
#and not installing
|
||||
#tags: network
|
||||
|
||||
- name: systemd-networkd in use
|
||||
include_tasks: sysd-netd-debian.yml
|
||||
when: is_debuntu and systemd_networkd_active
|
||||
#and not installing
|
||||
#tags: network
|
||||
|
||||
- name: RPi's have dhcpcd in use
|
||||
include_tasks: rpi_debian.yml
|
||||
when: is_debuntu and is_rpi
|
||||
#and not installing
|
||||
#tags: network
|
||||
|
||||
- name: Not RPi, Not NetworkManager, Not systemd-networkd in use
|
||||
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
|
||||
#and not installing
|
||||
#tags: network
|
||||
|
||||
#### end network layout
|
||||
- include_tasks: restart.yml
|
||||
when: not installing
|
||||
#tags: network, named, dhcpd, dnsmasq, squid, AP
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
value: OSM Vector Maps
|
||||
- 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!"'
|
||||
- option: installed
|
||||
- option: install
|
||||
value: "{{ osm_vector_maps_install }}"
|
||||
- option: enabled
|
||||
value: "{{ osm_vector_maps_enabled }}"
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
value: PostgreSQL
|
||||
- option: description
|
||||
value: '"PostgreSQL is a powerful, open source object-relational database system."'
|
||||
- option: installed
|
||||
- option: install
|
||||
value: "{{ postgresql_install }}"
|
||||
- option: enabled
|
||||
value: "{{ postgresql_enabled }}"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
- debug:
|
||||
var: nodejs_install
|
||||
|
||||
- debug:
|
||||
var: nodejs_enabled
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
package:
|
||||
name: vnstat
|
||||
state: present
|
||||
#tags: download
|
||||
|
||||
- name: Install /etc/vnstat.conf from template
|
||||
template:
|
||||
|
|
@ -53,7 +52,7 @@
|
|||
value: vnStat
|
||||
- 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)."'
|
||||
- option: installed
|
||||
- option: install
|
||||
value: "{{ vnstat_install }}"
|
||||
- option: enabled
|
||||
value: "{{ vnstat_enabled }}"
|
||||
|
|
|
|||
Loading…
Reference in a new issue