From 2cdf8463650b9fd1a9f2d663d6b906aa8e2af553 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 30 Jan 2020 04:57:53 -0500 Subject: [PATCH] Remove tags in ~30 files, improve verbiage --- roles/0-DEPRECATED-ROLES/docker/tasks/main.yml | 1 - roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml | 1 - .../0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml | 1 - roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml | 1 - .../0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml | 1 - .../teamviewer/tasks/install.yml | 5 ----- roles/2-common/tasks/iptables.yml | 2 -- roles/2-common/tasks/xo.yml | 1 - roles/all-vars/tasks/main.yml | 1 - roles/awstats/tasks/enable.yml | 2 +- roles/calibre-web/tasks/install.yml | 6 +++--- roles/captiveportal/tasks/main.yml | 2 +- roles/cups/tasks/main.yml | 2 +- roles/gitea/tasks/install.yml | 1 - roles/httpd/tasks/install.yml | 3 --- roles/iiab-admin/tasks/access.yml | 1 - roles/iiab-admin/tasks/main.yml | 2 -- roles/internetarchive/tasks/enable.yml | 2 +- roles/mongodb/tasks/install.yml | 1 - roles/monit/tasks/install.yml | 2 -- roles/mosquitto/tasks/install.yml | 1 - roles/munin/tasks/main.yml | 2 +- roles/network/tasks/computed_network.yml | 2 -- roles/network/tasks/dansguardian.yml | 1 - roles/network/tasks/ifcfg_mods.yml | 1 - roles/network/tasks/main.yml | 15 --------------- roles/osm-vector-maps/tasks/main.yml | 2 +- roles/postgresql/tasks/main.yml | 2 +- roles/sugarizer/tasks/install.yml | 1 - roles/vnstat/tasks/main.yml | 3 +-- 30 files changed, 11 insertions(+), 57 deletions(-) diff --git a/roles/0-DEPRECATED-ROLES/docker/tasks/main.yml b/roles/0-DEPRECATED-ROLES/docker/tasks/main.yml index 4bb4fcfa6..8c890c7d8 100644 --- a/roles/0-DEPRECATED-ROLES/docker/tasks/main.yml +++ b/roles/0-DEPRECATED-ROLES/docker/tasks/main.yml @@ -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 diff --git a/roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml b/roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml index 470216c8a..c7631ec10 100644 --- a/roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml +++ b/roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml @@ -2,7 +2,6 @@ package: name: ejabberd state: present - #tags: download #- name: Configure ejabberd # template: diff --git a/roles/0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml b/roles/0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml index 36a58d160..9be7687a2 100644 --- a/roles/0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml +++ b/roles/0-DEPRECATED-ROLES/ejabberd_xs/tasks/main.yml @@ -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 diff --git a/roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml b/roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml index 464c32762..7958b1135 100644 --- a/roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml +++ b/roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml @@ -7,7 +7,6 @@ - xinetd - xs-rsync - incron - #tags: download - name: Configure idmgr template: backup=yes diff --git a/roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml b/roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml index 71fb4b073..bb29c4298 100644 --- a/roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml +++ b/roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml @@ -6,7 +6,6 @@ - active-document - restful-document - python-xappy - #tags: download - name: Create sugar-stats directory tree file: path={{ item }} diff --git a/roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml b/roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml index 5410c926d..082faf382 100644 --- a/roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml +++ b/roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml @@ -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 diff --git a/roles/2-common/tasks/iptables.yml b/roles/2-common/tasks/iptables.yml index 7163c0a62..f0b5a4560 100644 --- a/roles/2-common/tasks/iptables.yml +++ b/roles/2-common/tasks/iptables.yml @@ -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: diff --git a/roles/2-common/tasks/xo.yml b/roles/2-common/tasks/xo.yml index 185f22949..527e46e87 100644 --- a/roles/2-common/tasks/xo.yml +++ b/roles/2-common/tasks/xo.yml @@ -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: diff --git a/roles/all-vars/tasks/main.yml b/roles/all-vars/tasks/main.yml index 19f42a49f..51c83ad19 100644 --- a/roles/all-vars/tasks/main.yml +++ b/roles/all-vars/tasks/main.yml @@ -11,4 +11,3 @@ debug: msg: "{{ msg.split('\n') }}" - #tags: debug_info diff --git a/roles/awstats/tasks/enable.yml b/roles/awstats/tasks/enable.yml index a0278bcf6..ae216c907 100644 --- a/roles/awstats/tasks/enable.yml +++ b/roles/awstats/tasks/enable.yml @@ -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 }}" diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index a6002e5c8..96a4940ca 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -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' } diff --git a/roles/captiveportal/tasks/main.yml b/roles/captiveportal/tasks/main.yml index 34347948e..6c164abd9 100644 --- a/roles/captiveportal/tasks/main.yml +++ b/roles/captiveportal/tasks/main.yml @@ -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 }}" diff --git a/roles/cups/tasks/main.yml b/roles/cups/tasks/main.yml index d071b22cc..d0a52f7ff 100644 --- a/roles/cups/tasks/main.yml +++ b/roles/cups/tasks/main.yml @@ -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 diff --git a/roles/gitea/tasks/install.yml b/roles/gitea/tasks/install.yml index 498fa4b9e..7f3b94815 100644 --- a/roles/gitea/tasks/install.yml +++ b/roles/gitea/tasks/install.yml @@ -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 diff --git a/roles/httpd/tasks/install.yml b/roles/httpd/tasks/install.yml index 123d8c940..8dfaf8b88 100644 --- a/roles/httpd/tasks/install.yml +++ b/roles/httpd/tasks/install.yml @@ -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) diff --git a/roles/iiab-admin/tasks/access.yml b/roles/iiab-admin/tasks/access.yml index 776f420d7..511103f17 100644 --- a/roles/iiab-admin/tasks/access.yml +++ b/roles/iiab-admin/tasks/access.yml @@ -4,4 +4,3 @@ - screen - lynx state: present - #tags: download diff --git a/roles/iiab-admin/tasks/main.yml b/roles/iiab-admin/tasks/main.yml index 38a673a2b..d0b38eb3a 100644 --- a/roles/iiab-admin/tasks/main.yml +++ b/roles/iiab-admin/tasks/main.yml @@ -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: diff --git a/roles/internetarchive/tasks/enable.yml b/roles/internetarchive/tasks/enable.yml index 6a5855c2b..c77003285 100644 --- a/roles/internetarchive/tasks/enable.yml +++ b/roles/internetarchive/tasks/enable.yml @@ -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 }}" diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml index a03d819bc..08e8c6a21 100644 --- a/roles/mongodb/tasks/install.yml +++ b/roles/mongodb/tasks/install.yml @@ -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/ diff --git a/roles/monit/tasks/install.yml b/roles/monit/tasks/install.yml index 6529cb3a6..7e16ada96 100644 --- a/roles/monit/tasks/install.yml +++ b/roles/monit/tasks/install.yml @@ -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: diff --git a/roles/mosquitto/tasks/install.yml b/roles/mosquitto/tasks/install.yml index aaf10bd3d..695a8d9f2 100644 --- a/roles/mosquitto/tasks/install.yml +++ b/roles/mosquitto/tasks/install.yml @@ -5,7 +5,6 @@ with_items: - mosquitto - mosquitto-clients - #tags: download - name: Disable & Stop 'mosquitto' service systemd: diff --git a/roles/munin/tasks/main.yml b/roles/munin/tasks/main.yml index e3409ac24..8af6a95aa 100644 --- a/roles/munin/tasks/main.yml +++ b/roles/munin/tasks/main.yml @@ -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 }}" diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml index e3c7203f8..5e78b7714 100644 --- a/roles/network/tasks/computed_network.yml +++ b/roles/network/tasks/computed_network.yml @@ -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: diff --git a/roles/network/tasks/dansguardian.yml b/roles/network/tasks/dansguardian.yml index 9d4c9345e..fba41efe9 100644 --- a/roles/network/tasks/dansguardian.yml +++ b/roles/network/tasks/dansguardian.yml @@ -2,7 +2,6 @@ package: name: dansguardian state: present - #tags: download - name: Install /etc/dansguardian/dansguardian.conf from template (Fedora) template: diff --git a/roles/network/tasks/ifcfg_mods.yml b/roles/network/tasks/ifcfg_mods.yml index 68f68a44d..140d5b8f4 100644 --- a/roles/network/tasks/ifcfg_mods.yml +++ b/roles/network/tasks/ifcfg_mods.yml @@ -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 diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 31e9ef1e4..4e0b7e026 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -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 diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index 2fba601a5..9aeb1945e 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/roles/osm-vector-maps/tasks/main.yml @@ -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 }}" diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml index df377b2bc..50a4bbc3e 100644 --- a/roles/postgresql/tasks/main.yml +++ b/roles/postgresql/tasks/main.yml @@ -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 }}" diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml index c613f691c..b11fd4572 100644 --- a/roles/sugarizer/tasks/install.yml +++ b/roles/sugarizer/tasks/install.yml @@ -2,7 +2,6 @@ - debug: var: nodejs_install - - debug: var: nodejs_enabled diff --git a/roles/vnstat/tasks/main.yml b/roles/vnstat/tasks/main.yml index 0303d0e46..ad33cc15e 100644 --- a/roles/vnstat/tasks/main.yml +++ b/roles/vnstat/tasks/main.yml @@ -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 }}"