diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 2c05b42de..bedb960de 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -69,15 +69,15 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: name - value: Calibre - - option: description - value: '"Calibre is an extremely popular personal library system for e-books."' - - option: calibre_src_url - value: "{{ calibre_src_url }}" - - option: calibre_dbpath - value: "{{ calibre_dbpath }}" - - option: calibre_port - value: "{{ calibre_port }}" - - option: calibre_enabled - value: "{{ calibre_enabled }}" + - option: name + value: Calibre + - option: description + value: '"Calibre is an extremely popular personal library system for e-books."' + - option: calibre_src_url + value: "{{ calibre_src_url }}" + - option: calibre_dbpath + value: "{{ calibre_dbpath }}" + - option: calibre_port + value: "{{ calibre_port }}" + - option: calibre_enabled + value: "{{ calibre_enabled }}" diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml index 817895f07..35bea770c 100644 --- a/roles/kalite/tasks/main.yml +++ b/roles/kalite/tasks/main.yml @@ -47,15 +47,15 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: name - value: "KA Lite" - - option: description - value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students want to track their own progress."' - - option: kalite_install - value: "{{ kalite_install }}" - - option: kalite_enabled - value: "{{ kalite_enabled }}" - - option: path - value: "{{ kalite_root }}" - - option: port - value: "{{ kalite_server_port }}" + - option: name + value: "KA Lite" + - option: description + value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students want to track their own progress."' + - option: kalite_install + value: "{{ kalite_install }}" + - option: kalite_enabled + value: "{{ kalite_enabled }}" + - option: path + value: "{{ kalite_root }}" + - option: port + value: "{{ kalite_server_port }}" diff --git a/roles/kiwix/tasks/main.yml b/roles/kiwix/tasks/main.yml index 742e698d9..045707f37 100644 --- a/roles/kiwix/tasks/main.yml +++ b/roles/kiwix/tasks/main.yml @@ -34,23 +34,23 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: name - value: Kiwix - - option: description - value: '"Part of https://github.com/kiwix/kiwix-tools/ -- kiwix-serve is the most used web server for ZIM files."' - - option: kiwix_install - value: "{{ kiwix_install }}" - - option: kiwix_enabled - value: "{{ kiwix_enabled }}" - - option: kiwix_url - value: "{{ kiwix_url }}" - - option: kiwix_url_plus_slash - value: "{{ kiwix_url_plus_slash }}" - - option: kiwix_path - value: "{{ kiwix_path }}" - - option: kiwix_port - value: "{{ kiwix_port }}" - - option: iiab_zim_path - value: "{{ iiab_zim_path }}" - - option: kiwix_library_xml - value: "{{ kiwix_library_xml }}" + - option: name + value: Kiwix + - option: description + value: '"Part of https://github.com/kiwix/kiwix-tools/ -- kiwix-serve is the most used web server for ZIM files."' + - option: kiwix_install + value: "{{ kiwix_install }}" + - option: kiwix_enabled + value: "{{ kiwix_enabled }}" + - option: kiwix_url + value: "{{ kiwix_url }}" + - option: kiwix_url_plus_slash + value: "{{ kiwix_url_plus_slash }}" + - option: kiwix_path + value: "{{ kiwix_path }}" + - option: kiwix_port + value: "{{ kiwix_port }}" + - option: iiab_zim_path + value: "{{ iiab_zim_path }}" + - option: kiwix_library_xml + value: "{{ kiwix_library_xml }}" diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml index 730274380..efe764642 100644 --- a/roles/network/tasks/computed_network.yml +++ b/roles/network/tasks/computed_network.yml @@ -158,17 +158,17 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: iiab_wan_enabled - value: "{{ iiab_wan_enabled }}" - - option: user_wan_iface - value: "{{ user_wan_iface }}" - - option: iiab_wan_iface - value: "{{ iiab_wan_iface }}" - - option: iiab_lan_enabled - value: "{{ iiab_lan_enabled }}" - - option: user_lan_iface - value: "{{ user_lan_iface }}" - - option: iiab_lan_iface - value: "{{ iiab_lan_iface }}" - - option: iiab_network_mode - value: "{{ iiab_network_mode }}" + - option: iiab_wan_enabled + value: "{{ iiab_wan_enabled }}" + - option: user_wan_iface + value: "{{ user_wan_iface }}" + - option: iiab_wan_iface + value: "{{ iiab_wan_iface }}" + - option: iiab_lan_enabled + value: "{{ iiab_lan_enabled }}" + - option: user_lan_iface + value: "{{ user_lan_iface }}" + - option: iiab_lan_iface + value: "{{ iiab_lan_iface }}" + - option: iiab_network_mode + value: "{{ iiab_network_mode }}" diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index fec38c805..bc37a341b 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -228,38 +228,38 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: has_ifcfg_gw - value: "{{ has_ifcfg_gw }}" - - option: prior_gateway_device - value: "{{ prior_gw_device }}" - - option: dhcpcd_result - value: "{{ dhcpcd_result }}" - - option: network_manager_active - value: "{{ network_manager_active }}" - - option: systemd_networkd_active - value: "{{ systemd_networkd_active }}" - - option: wan_in_interfaces - value: "{{ wan_in_interfaces }}" - - option: wireless_list_1(wifi1) - value: "{{ wifi1 }}" - - option: wireless_list_2(wifi2) - value: "{{ wifi2 }}" - - option: num_wifi_interfaces - value: "{{ num_wifi_interfaces }}" - - option: discovered_wireless_iface - value: "{{ discovered_wireless_iface }}" - - option: discovered_wired_iface - value: "{{ discovered_wired_iface }}" - - option: 'exclude_devices' - value: "{{ exclude_devices }}" - - option: num_lan_interfaces - value: "{{ num_lan_interfaces }}" - - option: gui_static_wan - value: "{{ gui_static_wan }}" - - option: iiab_lan_iface - value: "{{ iiab_lan_iface }}" - - option: iiab_wan_iface - value: "{{ iiab_wan_iface }}" + - option: has_ifcfg_gw + value: "{{ has_ifcfg_gw }}" + - option: prior_gateway_device + value: "{{ prior_gw_device }}" + - option: dhcpcd_result + value: "{{ dhcpcd_result }}" + - option: network_manager_active + value: "{{ network_manager_active }}" + - option: systemd_networkd_active + value: "{{ systemd_networkd_active }}" + - option: wan_in_interfaces + value: "{{ wan_in_interfaces }}" + - option: wireless_list_1(wifi1) + value: "{{ wifi1 }}" + - option: wireless_list_2(wifi2) + value: "{{ wifi2 }}" + - option: num_wifi_interfaces + value: "{{ num_wifi_interfaces }}" + - option: discovered_wireless_iface + value: "{{ discovered_wireless_iface }}" + - option: discovered_wired_iface + value: "{{ discovered_wired_iface }}" + - option: 'exclude_devices' + value: "{{ exclude_devices }}" + - option: num_lan_interfaces + value: "{{ num_lan_interfaces }}" + - option: gui_static_wan + value: "{{ gui_static_wan }}" + - option: iiab_lan_iface + value: "{{ iiab_lan_iface }}" + - option: iiab_wan_iface + value: "{{ iiab_wan_iface }}" # well if there ever was a point to tell the user things are FUBAR this is it. # limit 2 network adapters wifi wired diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index 8c8577767..6e71e6374 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -56,21 +56,21 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: name - value: OpenVPN - - option: description - value: '"OpenVPN enables live/remote support by connecting machines anywhere on the Internet, via a middleman server, using Virtual Private Network (VPN) techniques to create secure connections."' - - option: openvpn_install - value: "{{ openvpn_install }}" - - option: openvpn_enabled - value: "{{ openvpn_enabled }}" - - option: openvpn_handle - value: "{{ openvpn_handle }}" - - option: openvpn_cron_enabled - value: "{{ openvpn_cron_enabled }}" - - option: openvpn_server - value: "{{ openvpn_server }}" - - option: openvpn_server_virtual_ip - value: "{{ openvpn_server_virtual_ip }}" - - option: openvpn_server_port - value: "{{ openvpn_server_port }}" + - option: name + value: OpenVPN + - option: description + value: '"OpenVPN enables live/remote support by connecting machines anywhere on the Internet, via a middleman server, using Virtual Private Network (VPN) techniques to create secure connections."' + - option: openvpn_install + value: "{{ openvpn_install }}" + - option: openvpn_enabled + value: "{{ openvpn_enabled }}" + - option: openvpn_handle + value: "{{ openvpn_handle }}" + - option: openvpn_cron_enabled + value: "{{ openvpn_cron_enabled }}" + - option: openvpn_server + value: "{{ openvpn_server }}" + - option: openvpn_server_virtual_ip + value: "{{ openvpn_server_virtual_ip }}" + - option: openvpn_server_port + value: "{{ openvpn_server_port }}" diff --git a/roles/remoteit/tasks/main.yml b/roles/remoteit/tasks/main.yml index bc5be64a2..c66cd921a 100644 --- a/roles/remoteit/tasks/main.yml +++ b/roles/remoteit/tasks/main.yml @@ -26,11 +26,11 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: name - value: remote.it - - option: description - value: '"https://remote.it can help you remotely maintain an IIAB. Some benefits include: crossing multiple NATs/firewalls using a single TCP port, without requiring router port forwarding, and reducing your network''s vulnerability."' - - option: remoteit_install - value: "{{ remoteit_install }}" - - option: remoteit_enabled - value: "{{ remoteit_enabled }}" + - option: name + value: remote.it + - option: description + value: '"https://remote.it can help you remotely maintain an IIAB. Some benefits include: crossing multiple NATs/firewalls using a single TCP port, without requiring router port forwarding, and reducing your network''s vulnerability."' + - option: remoteit_install + value: "{{ remoteit_install }}" + - option: remoteit_enabled + value: "{{ remoteit_enabled }}" diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml index dccb4cd10..d6104353f 100644 --- a/roles/sshd/tasks/main.yml +++ b/roles/sshd/tasks/main.yml @@ -34,13 +34,13 @@ option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: - - option: name - value: sshd - - option: description - value: '"Secure Shell daemon (typically implemented by openssh-server) for remote login using the ''ssh'' low-level protocol."' - - option: sshd_install - value: "{{ sshd_install }}" - - option: sshd_enabled - value: "{{ sshd_enabled }}" - - option: sshd_port - value: "{{ sshd_port }}" + - option: name + value: sshd + - option: description + value: '"Secure Shell daemon (typically implemented by openssh-server) for remote login using the ''ssh'' low-level protocol."' + - option: sshd_install + value: "{{ sshd_install }}" + - option: sshd_enabled + value: "{{ sshd_enabled }}" + - option: sshd_port + value: "{{ sshd_port }}"