Experiment: comment out Ansible tags in 25 files

2025-03-09 15:40:17 +00:00 · 2020-01-13 20:41:03 -05:00 · 2020-01-13 20:41:03 -05:00 · 780ed4a955
commit 780ed4a955
parent 6e6fab170d
25 changed files with 82 additions and 142 deletions
--- a/roles/2-common/tasks/iptables.yml
+++ b/roles/2-common/tasks/iptables.yml
@ -26,38 +26,31 @@
    path: /etc/systemd/system/iptables.service
    state: absent

-#- name: Remove iptables-xs.service file from /etc
-#  file:
-#    path: /etc/systemd/system/iptables-xs.service
-#    state: absent
-
 - name: Install package iptables-persistent (debuntu)
  package:
    name: iptables-persistent
    state: present
  when: is_debuntu | bool
-  tags:
-    - download
+  #tags: download

 - name: Install package iptables-services (OS's other than debuntu)
  package:
    name: iptables-services
    state: present
  when: not is_debuntu
-  tags:
-    - download
+  #tags: download

 - name: Install /etc/sysconfig/iptables-config from template
  template:
    src: iptables-config
    dest: /etc/sysconfig/iptables-config
-    owner: root
-    group: root
-    mode: 0644
+    # owner: root
+    # group: root
+    # mode: '0644'

 - name: Install /etc/network/if-pre-up.d/iptables from template (debuntu)
  template:
    src: iptables
    dest: /etc/network/if-pre-up.d/iptables
-    mode: 0755
+    mode: '0755'
  when: is_debuntu | bool
--- a/roles/2-common/tasks/xo.yml
+++ b/roles/2-common/tasks/xo.yml
@ -132,17 +132,16 @@
  with_items:
    - hostapd_8188_i386
  when: wifi_id == "tplink_WM725M" and xo_model == "XO-1.5" and internet_available
-  tags:
-    - xo
+  #tags: xo

 - name: Put the substitute in place
  copy:
    src: "{{ downloads_dir }}/hostapd_8188_i386"
    dest: /usr/sbin/hostapd
    backup: yes
-    mode: 0775
-    owner: root
-    group: root
+    # owner: root
+    # group: root
+    mode: '0775'
  when: wifi_id == "tplink_WM725M" and xo_model == "XO-1.5"

 - name: Reboot system
--- a/roles/all-vars/tasks/main.yml
+++ b/roles/all-vars/tasks/main.yml
@ -11,4 +11,4 @@

  debug: 
    msg: "{{ msg.split('\n') }}"       
-  tags: debug_info
+  #tags: debug_info
--- a/roles/cups/tasks/main.yml
+++ b/roles/cups/tasks/main.yml
@ -4,8 +4,7 @@
    name: cups
    state: present
  when: cups_install | bool
-  tags:
-    - download
+  #tags: download

 - name: Install our own /etc/cups/cupsd.conf from template, to permit local LAN admin
  template:
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@ -5,7 +5,7 @@
    - docker
    - python-docker-py
  when: docker_install | bool
-  tags: download
+  #tags: download

 - name: put the systemd startup file in place
  template: src=docker.service
--- a/roles/ejabberd/tasks/main.yml
+++ b/roles/ejabberd/tasks/main.yml
@ -2,8 +2,7 @@
  package:
    name: ejabberd
    state: present
-  tags:
-    - download
+  #tags: download

 #- name: Configure ejabberd
 #  template:
--- a/roles/ejabberd_xs/tasks/main.yml
+++ b/roles/ejabberd_xs/tasks/main.yml
@ -3,8 +3,7 @@
           state=present
  with_items:
   - ejabberd-2.1.11
-  tags:
-    - download
+  #tags: download
  when: not is_debuntu

 # need to use lineinfile and better regexp
--- a/roles/gitea/tasks/install.yml
+++ b/roles/gitea/tasks/install.yml
@ -4,16 +4,14 @@
  systemd:
    name: gitea
    state: stopped
-  tags:
-    - pre-install
+  #tags: pre-install
  ignore_errors: yes

 - name: Ensure group gitea exists
  group:
    name: gitea
    state: present
-  tags:
-    - pre-install
+  #tags: pre-install

 - name: Create user gitea
  user:
@ -21,8 +19,7 @@
    comment: Gitea daemon account
    groups: gitea
    home: "{{ gitea_home }}"
-  tags:
-    - pre-install
+  #tags: pre-install

 - name: Create Gitea directory structure
  file:
@ -31,19 +28,17 @@
    owner: gitea
    group: gitea
  with_items: "{{ gitea_subdirectories }}"
-  tags:
-    - pre-install
+  #tags: pre-install

 - name: Make directories data, indexers, and log writable
  file:
    path: "{{ gitea_root_directory }}/{{ item }}"
-    mode: 0750
+    mode: '0750'
  with_items:
    - data
    - indexers
    - log
-  tags:
-    - pre-install
+  #tags: pre-install

 # Download, verify, and link Gitea binary

@ -56,27 +51,22 @@
  get_url:
    url: "{{ gitea_download_url }}"
    dest: "{{ gitea_install_path }}"
-    mode: 0775
-  tags:
-    - install
+    mode: '0775'
+  #tags: install
  when: internet_available | bool

 - name: Download Gitea GPG signature
  get_url:
    url: "{{ gitea_integrity_url }}"
    dest: "{{ gitea_checksum_path }}"
-  tags:
-    - never
-    - verify
+  #tags: never, verify
  when: internet_available | bool

 - name: Verify Gitea binary with GPG signature
  shell: |
    gpg --keyserver pgp.mit.edu --recv {{ gitea_gpg_key }}
    gpg --verify {{ gitea_checksum_path }} {{ gitea_install_path }}
-  tags:
-    - never
-    - verify
+  #tags: never, verify
  ignore_errors: yes

 - name: Link Gitea
@ -86,8 +76,7 @@
    owner: gitea
    group: gitea
    state: link
-  tags:
-    - install
+  #tags: install

 # Configure Gitea

@ -102,9 +91,8 @@
    state: directory
    owner: root
    group: gitea
-    mode: 0770
-  tags:
-    - config
+    mode: '0770'
+  #tags: config

 - name: Create app.ini
  template:
@ -112,7 +100,7 @@
    dest: /etc/gitea/app.ini
    owner: root
    group: gitea
-    mode: 0664
+    mode: '0664'

 # Create systemd service & prepare Apache for http://box/gitea

--- a/roles/httpd/tasks/install.yml
+++ b/roles/httpd/tasks/install.yml
@ -8,8 +8,7 @@
      - "php{{ php_version }}-curl"
    state: present
  when: is_debian | bool
-  tags:
-    - download
+  #tags: download

 - name: 'Install 2 packages: apache2, php (ubuntu)'
  package:
@ -20,8 +19,7 @@
      - php
    state: present
  when: is_ubuntu | bool
-  tags:
-    - download
+  #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
@ -52,8 +50,7 @@
      - php-curl
    state: present
  when: is_redhat | bool
-  tags:
-    - download
+  #tags: download

 # remove symlinks for mpm-event, replace with mpm-prefork
 - name: Remove both mpm_event symlinks from /etc/apache2/mods-enabled (debuntu)
--- a/roles/httpd/tasks/main.yml
+++ b/roles/httpd/tasks/main.yml
@ -1,18 +1,15 @@
 - include_tasks: install.yml
-  tags:
-    - base
+  #tags: base

 - include_tasks: html.yml
-  tags:
-    - base
+  #tags: base

 # Partially fixes search @ http://box/modules/es-wikihow (on RPi anyway) see https://github.com/iiab/iiab/issues/829
 - include_tasks: php-stem.yml
-  tags:
-    - base
+  #tags: base

 - name: Install /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation.  (Script can be run manually and/or at the end of Stage 4 = roles/4-server-options/tasks/main.yml)
  template:
    src: refresh-wiki-docs.sh
    dest: /usr/bin/iiab-refresh-wiki-docs
-    mode: 0755
+    mode: '0755'
--- a/roles/idmgr/tasks/main.yml
+++ b/roles/idmgr/tasks/main.yml
@ -7,8 +7,7 @@
   - xinetd
   - xs-rsync
   - incron
-  tags:
-    - download
+  #tags: download

 - name: Configure idmgr
  template: backup=yes
--- a/roles/iiab-admin/tasks/access.yml
+++ b/roles/iiab-admin/tasks/access.yml
@ -4,5 +4,4 @@
    - screen
    - lynx
    state: present
-  tags:
-    - download
+  #tags: download
--- a/roles/iiab-admin/tasks/main.yml
+++ b/roles/iiab-admin/tasks/main.yml
@ -1,11 +1,9 @@
 - include_tasks: admin-user.yml
-  tags:
-    - base
+  #tags: base
  when: iiab_admin_user_install | bool

 - include_tasks: access.yml
-  tags:
-    - base
+  #tags: base

 - name: Add 'iiab-admin' variable values to {{ iiab_ini_file }}
  ini_file:
@ -25,7 +23,7 @@
  template:
    src: sshpwd-profile-iiab.sh
    dest: /etc/profile.d/
-    mode: 0644
+    mode: '0644'

 - name: Is this LXDE-pi?
  stat:
@ -36,7 +34,7 @@
  template:
    src: sshpwd-lxde-iiab.sh
    dest: /etc/xdg/lxsession/LXDE-pi/
-    mode: 0755
+    mode: '0755'
  when: lx.stat.isdir is defined and lx.stat.isdir and is_rpi and is_debuntu

 # 2019-03-07: This popup (/etc/xdg/lxsession/LXDE-pi/sshpwd-lxde-iiab.sh) does
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@ -7,8 +7,7 @@
      - 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
+  #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/
--- a/roles/monit/tasks/install.yml
+++ b/roles/monit/tasks/install.yml
@ -2,16 +2,14 @@
  package:
    name: monit
    state: present
-  tags:
-    - download
+  #tags: download

 - name: Install chkconfig package (debian-8)
  package:
    name: chkconfig
    state: present
  when: is_debian and ansible_distribution_major_version == "8"
-  tags:
-    - download
+  #tags: download

 - name: Install /etc/monitrc from template
  template:
@ -20,7 +18,7 @@
    dest: /etc/monitrc
    owner: root
    group: root
-    mode: 0600
+    mode: '0600'

 # - name: Install config file /etc/monit.d/watchdog from template (NEVER RUNS, WHY?)
 #  template:
@ -29,7 +27,7 @@
 #    owner: root
 #    group: root
 #    force: yes
-#    mode: 0755
+#    mode: '0755'
 #  register: monit_config
 #  when: False    # IS THIS A BUG ?
 #  until: monit_config | success
--- a/roles/mosquitto/tasks/install.yml
+++ b/roles/mosquitto/tasks/install.yml
@ -5,7 +5,7 @@
  with_items:
    - mosquitto
    - mosquitto-clients
-  tags: download
+  #tags: download

 - name: Disable & Stop 'mosquitto' service
  systemd:
@ -17,7 +17,7 @@
  file:
    path: /etc/mosquitto/passwd
    state: touch
-    mode: "u=rw,g=r,o=r"    # 0644
+    mode: "u=rw,g=r,o=r"    # '0644'

 - name: Populate /etc/mosquitto/passwd with actual username/password
  shell: mosquitto_passwd -b /etc/mosquitto/passwd "{{ mosquitto_user }}" "{{ mosquitto_password  }}"
@ -28,7 +28,7 @@
    dest: /etc/mosquitto/conf.d/websockets.conf
    owner: root
    group: root
-    mode: 0755
+    mode: '0755'

 - name: "Add 'mosquitto_installed: True' to {{ iiab_state_file }}"
  lineinfile:
--- a/roles/mysql/tasks/main.yml
+++ b/roles/mysql/tasks/main.yml
@ -14,8 +14,7 @@
      - php{{ php_version }}-xmlrpc
    state: present
  when: is_debuntu | bool
-  tags:
-    - download
+  #tags: download

 - name: Install php{{ php_version }}-xml (ubuntu or debian 9+)
  package:
@ -45,18 +44,15 @@
      - php-xmlrpc
    state: present
  when: not is_debuntu
-  tags:
-    - download
+  #tags: download

 - include_tasks: centos.yml
  when: ansible_distribution == "CentOS"
-  tags:
-    - download
+  #tags: download

 - include_tasks: fedora.yml
  when: ansible_distribution == "Fedora"
-  tags:
-    - download
+  #tags: download


 # 2019-07-03 @jvonau @holta: the next 50 lines (6 stanzas) double MariaDB's
@ -129,7 +125,7 @@
    src: my.cnf.j2
    dest: /root/.my.cnf
    owner: root
-    mode: 0600
+    mode: '0600'
  when: mysql_enabled | bool

 # 'localhost' needs to be the last item for idempotency, see
--- a/roles/network/tasks/computed_network.yml
+++ b/roles/network/tasks/computed_network.yml
@ -177,10 +177,8 @@
    dest: "{{ iiab_env_file }}"
    regexp: '^IIAB_WAN_DEVICE=*'
    line: 'IIAB_WAN_DEVICE="{{ iiab_wan_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
+  #tags: network

 - name: Record IIAB_LAN_DEVICE to {{ iiab_env_file }}
  lineinfile:
@ -189,8 +187,7 @@
    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
+  #tags: network

 - name: Add 'computed_network' variable values to {{ iiab_ini_file }}
  ini_file:
--- a/roles/network/tasks/dansguardian.yml
+++ b/roles/network/tasks/dansguardian.yml
@ -2,8 +2,7 @@
  package:
    name: dansguardian
    state: present
-  tags:
-    - download
+  #tags: download

 - name: Install /etc/dansguardian/dansguardian.conf from template (Fedora)
  template:
--- a/roles/network/tasks/ifcfg_mods.yml
+++ b/roles/network/tasks/ifcfg_mods.yml
@ -84,8 +84,7 @@
    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
+  #tags: network

 - include_tasks: enable_wan.yml
  when: not installing and not iiab_demo_mode
--- a/roles/postgresql/tasks/main.yml
+++ b/roles/postgresql/tasks/main.yml
@ -2,24 +2,21 @@
  package:
    name: postgresql
    state: present
-  tags:
-    - download
+  #tags: download

 - name: Install postgresql-client (debuntu)
  package:
    name: postgresql-client
    state: present
  when: is_debuntu | bool
-  tags:
-    - download
+  #tags: download

 - name: Install postgresql-server (OS's other than debuntu)
  package:
    name: postgresql-server
    state: present
  when: not is_debuntu
-  tags:
-    - download
+  #tags: download

 - name: Install /etc/systemd/system/postgresql-iiab.service from template
  template:
@ -27,14 +24,14 @@
    dest: /etc/systemd/system/postgresql-iiab.service
    owner: root
    group: root
-    mode: 0644
+    mode: '0644'

 - name: Create PostgreSQL data dir /library/pgsql-iiab, owned by postgres:postgres
  file:
    path: /library/pgsql-iiab
    owner: postgres
    group: postgres
-    mode: 0700
+    mode: '0700'
    state: directory

 - name: Make sure locale {{ postgresql_locale }} is enabled (debuntu)    # en_US.UTF-8
@ -72,7 +69,7 @@
    dest: /library/pgsql-iiab/postgresql.conf
    owner: postgres
    group: postgres
-    mode: 0640
+    mode: '0640'

 # Probably Not Nec!  Given stanza below does the same.
 - name: 'Stop postgresql service: /etc/init.d/postgresql stop (debuntu)'
--- a/roles/samba/tasks/main.yml
+++ b/roles/samba/tasks/main.yml
@ -9,7 +9,7 @@
    path: "{{ shared_dir }}"
    owner: "{{ smbuser }}"
    group: "{{ smbuser }}"
-    mode: 0777
+    mode: '0777'
    state: directory

 # Install and configure samba server (requires ports 137, 138, 139, 445 open).
@ -21,9 +21,7 @@
      - samba-common
      - cifs-utils
    state: present
-  tags:
-    - samba
-    - download
+  #tags: samba, download

 - name: Install /etc/samba/smb.conf from template
  template:
@ -41,8 +39,7 @@
    name: "{{ smb_service }}"
    state: started
    enabled: yes
-  tags:
-    - samba
+  #tags: samba
  when: samba_enabled | bool

 - name: Enable & Start NetBIOS name server ({{ nmb_service }})
@ -50,8 +47,7 @@
    name: "{{ nmb_service }}"
    state: started
    enabled: yes
-  tags:
-    - samba
+  #tags: samba
  when: samba_enabled | bool

 - name: Disable Samba if not samba_enabled
@ -59,8 +55,7 @@
    name: "{{ smb_service }}"
    state: stopped
    enabled: no
-  tags:
-    - samba
+  #tags: samba
  when: not samba_enabled

 - name: Disable NetBIOS name server ({{ nmb_service }}) if not samba_enabled
@ -68,8 +63,7 @@
    name: "{{ nmb_service }}"
    state: stopped
    enabled: no
-  tags:
-    - samba
+  #tags: samba
  when: not samba_enabled

 - name: Add 'samba' variable values to {{ iiab_ini_file }}
--- a/roles/sugar-stats/tasks/main.yml
+++ b/roles/sugar-stats/tasks/main.yml
@ -6,8 +6,7 @@
    - active-document
    - restful-document
    - python-xappy
-  tags:
-    - download
+  #tags: download

 - name: Create sugar-stats directory tree
  file: path={{ item }}
--- a/roles/teamviewer/tasks/install.yml
+++ b/roles/teamviewer/tasks/install.yml
@ -2,26 +2,22 @@
 - 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
+  #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
+  #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
+  #tags: download

 - name: Install X Windows on CentOS
  shell: yum groupinstall -y "Server with GUI"
  when: internet_available and ansible_distribution == "CentOS"
-  tags:
-    - download
+  #tags: download

 - name: Download TeamViewer software
  get_url:
@ -29,8 +25,7 @@
    dest: "{{ yum_packages_dir }}/{{ teamviewer_rpm_file }}"
    timeout: "{{ download_timeout }}"
  when: internet_available | bool
-  tags:
-    - download
+  #tags: download

 # F22 has issues with yum localinstall exclude for now
 - name: Do the install of TeamViewer, pulling in any required dependencies
--- a/roles/vnstat/tasks/main.yml
+++ b/roles/vnstat/tasks/main.yml
@ -2,16 +2,15 @@
  package:
    name: vnstat
    state: present
-  tags:
-    - download
+  #tags: download

 - name: Install /etc/vnstat.conf from template
  template:
    src: vnstat.conf.j2
    dest: /etc/vnstat.conf
-    mode: 0744
-    owner: root
-    group: root
+    # owner: root
+    # group: root
+    mode: '0744'

 - name: Create database for WAN to collect vnStat data
  shell: /usr/bin/vnstat -i {{ iiab_wan_iface }}
@ -23,6 +22,7 @@
 - name: Enable & Start vnStat's systemd service
  systemd:
    name: vnstat
+    daemon_reload: yes
    enabled: yes
    state: started