From 773fc1dc0cc67967958e00eb39b6f1fda14bd74a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Aug 2020 12:42:51 -0400 Subject: [PATCH 01/16] Create linuxmint-20.yml --- vars/linuxmint-20.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 vars/linuxmint-20.yml diff --git a/vars/linuxmint-20.yml b/vars/linuxmint-20.yml new file mode 100644 index 000000000..f58ba79ed --- /dev/null +++ b/vars/linuxmint-20.yml @@ -0,0 +1,29 @@ +is_debuntu: True +is_ubuntu: True +is_ubuntu_20: True + +# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True +# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True) +dns_service: bind9 +dns_user: bind +dhcp_service: isc-dhcp-server + +proxy: squid +proxy_user: proxy +apache_service: apache2 +apache_user: www-data +apache_conf_dir: apache2/sites-available +apache_config_dir: "{{ apache_conf_dir }}" # for iiab-admin-console/roles/console/tasks/main.yml Line 150 +apache_log_dir: /var/log/apache2 +smb_service: smbd +nmb_service: nmbd +systemctl_program: /bin/systemctl +# issue raised +mysql_service: mariadb +apache_log: /var/log/apache2/access.log +sshd_package: openssh-server +sshd_service: ssh +php_version: 7.4 +# "postgresql_version: 11.2" failed (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 19.04) +postgresql_version: 12 +systemd_location: /lib/systemd/system From 39cc56369ec3e5fa0bd6bc088f7384848aef8a81 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Aug 2020 12:51:17 -0400 Subject: [PATCH 02/16] Update local_facts.fact --- scripts/local_facts.fact | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact index 9f4143ce9..21c8727cf 100755 --- a/scripts/local_facts.fact +++ b/scripts/local_facts.fact @@ -22,24 +22,26 @@ DHCPCD_PATH=`which dhcpcd` NM_PATH=`which NetworkManager` case $OS_VER in - "fedora-18" | \ - "fedora-22" | \ - "debian-8" | \ - "debian-9" | \ - "debian-10" | \ - "ubuntu-16" | \ - "ubuntu-17" | \ - "ubuntu-18" | \ - "ubuntu-19" | \ - "ubuntu-20" | \ - "centos-7" | \ - "raspbian-8" | \ - "raspbian-9" | \ + "fedora-18" | \ + "fedora-22" | \ + "debian-8" | \ + "debian-9" | \ + "debian-10" | \ + "ubuntu-16" | \ + "ubuntu-17" | \ + "ubuntu-18" | \ + "ubuntu-19" | \ + "ubuntu-20" | \ + "linuxmint-20" | \ + "centos-7" | \ + "raspbian-8" | \ + "raspbian-9" | \ "raspbian-10") - ;; - *) OS_VER="OS_not_supported" - ;; + ;; + *) OS_VER="OS_not_supported" + ;; esac + # get current version BRANCH=`git rev-parse --abbrev-ref HEAD` COMMIT=`git rev-parse --verify HEAD` @@ -71,7 +73,7 @@ ANSIBLE_VERSION=$(ansible --version|head -n 1|cut -f 2 -d " ") if [ ! x$DHCPCD_PATH = x ]; then DHCPCD=`systemctl is-enabled dhcpcd` fi -# the check is debian family only is_redhad would use NetworkManager as the +# the check is debian family only is_redhat would use NetworkManager as the # service name. if [ ! x$NM_PATH = x ]; then NM=`systemctl is-enabled network-manager` From 7ce4c0dd9c301a19ac5f0bfd82dc6767e3559a4a Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 21 Aug 2020 16:34:24 -0400 Subject: [PATCH 03/16] Rename ansible-2.8.x to ansible-2.8.x.deprecated --- scripts/{ansible-2.8.x => ansible-2.8.x.deprecated} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{ansible-2.8.x => ansible-2.8.x.deprecated} (100%) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x.deprecated similarity index 100% rename from scripts/ansible-2.8.x rename to scripts/ansible-2.8.x.deprecated From 911b1cca73a710beea124223747b3a60df7db0b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 21 Aug 2020 16:34:40 -0400 Subject: [PATCH 04/16] Rename ansible-2.9.x to ansible-2.9.x.deprecated --- scripts/{ansible-2.9.x => ansible-2.9.x.deprecated} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{ansible-2.9.x => ansible-2.9.x.deprecated} (100%) diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x.deprecated similarity index 100% rename from scripts/ansible-2.9.x rename to scripts/ansible-2.9.x.deprecated From e87afe3f5fb2a72aa07287f8ee02411eb2b19218 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 21 Aug 2020 16:39:27 -0400 Subject: [PATCH 05/16] Avoid problematic /usr/local/bin/apt on Linux Mint --- scripts/ansible | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index 427cee045..b884c1238 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,5 +1,6 @@ #!/bin/bash -e +APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint CURR_VER="undefined" # Ansible version you currently have installed GOOD_VER="2.9.6" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent @@ -66,8 +67,8 @@ elif [ -f /etc/centos-release ]; then elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian if ! grep -q focal /etc/os-release; then echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n" - apt update - apt -y install dirmngr + $APT_PATH/apt update + $APT_PATH/apt -y install dirmngr echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu bionic main" \ > /etc/apt/sources.list.d/iiab-ansible.list @@ -90,8 +91,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian fi echo -e "\napt update; apt install ansible and python3 dependencies explained at:" echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" - apt update - apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ + $APT_PATH/apt update + $APT_PATH/apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ python3-passlib python3-pip python3-setuptools python3-venv virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" From 6e4c648de3b904e9773703a7c6f4b696120fe350 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 22 Aug 2020 09:07:16 -0400 Subject: [PATCH 06/16] iiab-diagnostics: relabel Raspbian as "Raspberry Pi OS" --- scripts/iiab-diagnostics | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/iiab-diagnostics b/scripts/iiab-diagnostics index 683463218..979d56304 100755 --- a/scripts/iiab-diagnostics +++ b/scripts/iiab-diagnostics @@ -119,13 +119,13 @@ cat_file /etc/rpi-issue echo "-IIAB-EXPLANATION-OF-THE-ABOVE-------------------------------------------------" >> $outfile echo >> $outfile if [ -f /etc/rpi-issue ]; then - echo "stage2 = Raspbian Lite" >> $outfile - echo "stage4 = Raspbian With Desktop" >> $outfile - echo "stage5 = Raspbian With Desktop + Recommended Software" >> $outfile + echo "stage2 = Raspberry Pi OS Lite" >> $outfile + echo "stage4 = Raspberry Pi OS with desktop" >> $outfile + echo "stage5 = Raspberry Pi OS with desktop + recommended software" >> $outfile echo >> $outfile echo "SEE https://github.com/RPi-Distro/pi-gen#stage-anatomy" >> $outfile else - echo "(This is NOT Raspbian!)" >> $outfile + echo "(This is NOT Raspberry Pi OS!)" >> $outfile fi echo >> $outfile cat_file /etc/issue.net From db56e184d1ba2ff58a5cb440a245e6ef53c10e89 Mon Sep 17 00:00:00 2001 From: georgejhunt Date: Sat, 22 Aug 2020 10:47:57 -0700 Subject: [PATCH 07/16] 7.2 maps [OSM] (#2486) * move scripts and assets * webpack does not bundle externap -- not node -- modules * change main.js to *-bundle for viewer, test-page, and installer * disable the long download of osm for all versions of local_vars * start nginx for OSM always * let nodejs provide js packages * move scripts and assets * webpack does not bundle externap -- not node -- modules * change main.js to *-bundle for viewer, test-page, and installer * disable the long download of osm for all versions of local_vars * start nginx for OSM always * let nodejs provide js packages * change soft coded pointers from test branch to master --- roles/osm-vector-maps/defaults/main.yml | 12 ++++++++---- roles/osm-vector-maps/tasks/install.yml | 16 ++++++++-------- roles/osm-vector-maps/tasks/nginx.yml | 5 +++-- vars/local_vars_big.yml | 2 +- vars/local_vars_medium.yml | 2 +- vars/local_vars_min.yml | 2 +- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml index 2830e7c01..822803728 100644 --- a/roles/osm-vector-maps/defaults/main.yml +++ b/roles/osm-vector-maps/defaults/main.yml @@ -6,10 +6,14 @@ # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! -#osm_map_url: https://github.com/iiab/maps/raw/master -# for testing, use the new unpublished version of regions.json + +# The following soft coded variables allow testing, before pulling PR's into master osm_repo_url: https://raw.githubusercontent.com/iiab/maps -archive_org_url: https://archive.org/download -satellite_version: satellite_z0-z9_v3.mbtiles +#osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps maps_branch: 'master' +#maps_branch: '7.2-maps' + +# soft code sources +archive_org_url: https://archive.org/download map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles +satellite_version: satellite_z0-z9_v3.mbtiles diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 3c46756e6..b6ab41aad 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -49,13 +49,13 @@ dest: "{{ vector_map_path }}/maplist/assets/regions.json" state: link -- name: Download the JavaScript bundle with OpenLayers (main.js) for test page http://box/maps/maplist +- name: Download the JavaScript bundle with OpenLayers (test-page-bundle.js) for test page http://box/maps/maplist # At this point, fetches from github.com/georgejhunt/maps from test branch get_url: url: "{{ item }}" dest: '{{ vector_map_path }}/test-page/' with_items: - - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/main.js" + - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/test-page-bundle.js" - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/index.html" - name: Fetch the javascript bundle with openlayers for Viewer page @@ -65,8 +65,8 @@ dest: '{{ vector_map_path }}/viewer/' with_items: - index.html - - main.js - - main.js.map + - viewer-bundle.js + - viewer-bundle.js.map - name: Get the helper files for viewer get_url: @@ -74,7 +74,6 @@ dest: '{{ vector_map_path }}/viewer/' with_items: - mbtileinfo.php - - ol-contextmenu.css - popup.css - searchapi.php - tileserver.php @@ -96,7 +95,7 @@ dest: '{{ vector_map_path }}/installer/' with_items: - index.html - - main.js + - installer-bundle.js - name: Fetch the action routines for installer get_url: @@ -118,7 +117,8 @@ - center.png - countries.json - fonts.css - - ol5-layerswitcher.css + - ol-layerswitcher.css + - ol-contextmenu.css - pin_drop.png - sprite@2x.json - sprite@2x.png @@ -170,7 +170,7 @@ - name: Copy a scripts to download tiles get_url: - url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/{{ item }}" + url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/scripts/{{ item }}" dest: /usr/bin/ mode: 0755 with_items: diff --git a/roles/osm-vector-maps/tasks/nginx.yml b/roles/osm-vector-maps/tasks/nginx.yml index b764220d6..c02aa8281 100644 --- a/roles/osm-vector-maps/tasks/nginx.yml +++ b/roles/osm-vector-maps/tasks/nginx.yml @@ -2,13 +2,14 @@ template: src: osm-vector-maps-nginx.conf.j2 dest: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" # /etc/nginx/conf.d - when: osm_vector_maps_enabled | bool + when: osm_vector_maps_install | bool +# Note that the above change from enabled->install is required by the OSM command line installer - name: Disable http://box/maps & http://box/osm-vector-maps via NGINX, by removing {{ nginx_conf_dir }}/osm-vector-maps-nginx.conf file: path: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" # /etc/nginx/conf.d state: absent - when: not osm_vector_maps_enabled + when: not osm_vector_maps_install - name: Reload 'nginx' systemd service systemd: diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 7bf36019b..6d59e3b45 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -297,7 +297,7 @@ moodle_enabled: True # Regional OSM vector maps use far less disk space than bitmap/raster versions. # Instructions: https://github.com/iiab/iiab/wiki/IIAB-Maps osm_vector_maps_install: True -osm_vector_maps_enabled: True +osm_vector_maps_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 0d3e1082e..e6d2397b9 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -297,7 +297,7 @@ moodle_enabled: False # Regional OSM vector maps use far less disk space than bitmap/raster versions. # Instructions: https://github.com/iiab/iiab/wiki/IIAB-Maps osm_vector_maps_install: True -osm_vector_maps_enabled: True +osm_vector_maps_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index def8807c9..c903090b6 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -297,7 +297,7 @@ moodle_enabled: False # Regional OSM vector maps use far less disk space than bitmap/raster versions. # Instructions: https://github.com/iiab/iiab/wiki/IIAB-Maps osm_vector_maps_install: True -osm_vector_maps_enabled: True +osm_vector_maps_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 From dc41fb4bf77eea3934ac8f9deabb6f0ecd5e3b02 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 23 Aug 2020 03:48:33 -0500 Subject: [PATCH 08/16] should be able to alter with stock creds --- roles/mysql/tasks/install.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/roles/mysql/tasks/install.yml b/roles/mysql/tasks/install.yml index 23baf1f4a..b692ca797 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -106,6 +106,22 @@ daemon_reload: yes state: restarted +- name: Remove the MySQL 'test' database + mysql_db: + db: test + state: absent + +- name: Delete anonymous MySQL server user for {{ ansible_hostname }} + mysql_user: + user: "" + host: "{{ ansible_hostname }}" + state: absent + +- name: Delete anonymous MySQL server user for localhost + mysql_user: + user: "" + state: absent + - name: Install /root/.my.cnf file from template, with root password credentials template: src: my.cnf.j2 @@ -134,22 +150,6 @@ - 127.0.0.1 - ::1 -- name: Delete anonymous MySQL server user for {{ ansible_hostname }} - mysql_user: - user: "" - host: "{{ ansible_hostname }}" - state: absent - -- name: Delete anonymous MySQL server user for localhost - mysql_user: - user: "" - state: absent - -- name: Remove the MySQL 'test' database - mysql_db: - db: test - state: absent - # RECORD MySQL AS INSTALLED From 4019a5e689b5cec53cad154bf976e0b10613dac6 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 23 Aug 2020 12:25:11 -0500 Subject: [PATCH 09/16] keep root websockets using password --- roles/mysql/tasks/install.yml | 27 ++++++++------------------- roles/mysql/templates/my.cnf.j2 | 6 +++--- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/roles/mysql/tasks/install.yml b/roles/mysql/tasks/install.yml index b692ca797..49250e70b 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -106,6 +106,13 @@ daemon_reload: yes state: restarted +- name: Install /root/.my.cnf file from template, with root password credentials + template: + src: my.cnf.j2 + dest: /root/.my.cnf + owner: root + mode: '0600' + - name: Remove the MySQL 'test' database mysql_db: db: test @@ -122,31 +129,13 @@ user: "" state: absent -- name: Install /root/.my.cnf file from template, with root password credentials - template: - src: my.cnf.j2 - dest: /root/.my.cnf - owner: root - mode: '0600' - -# 'localhost' needs to be the last item for idempotency, see -# http://ansible.cc/docs/modules.html#mysql-user -# unfortunately it still doesn't work -- name: Update MySQL root password for localhost root accounts - mysql_user: - name: root - host: localhost - password: "{{ mysql_root_password }}" - priv: "*.*:ALL,GRANT" - -- name: Update MySQL root password for all remaining root accounts (127.0.0.1, ::1) +- name: Create MySQL root password for root accounts on (127.0.0.1, ::1) mysql_user: name: root host: "{{ item }}" password: "{{ mysql_root_password }}" priv: "*.*:ALL,GRANT" with_items: - #- "{{ iiab_hostname }}.{{ iiab_domain }}" - 127.0.0.1 - ::1 diff --git a/roles/mysql/templates/my.cnf.j2 b/roles/mysql/templates/my.cnf.j2 index cb1e80ef4..b77876bec 100644 --- a/roles/mysql/templates/my.cnf.j2 +++ b/roles/mysql/templates/my.cnf.j2 @@ -1,4 +1,4 @@ [client] -user=root -password={{ mysql_root_password }} -socket=/run/mysqld/mysqld.sock +user = root +password = +socket = /run/mysqld/mysqld.sock From 03ad881fd1d051a0787d6d6a5c39a2efc473e0fa Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 23 Aug 2020 21:57:48 -0500 Subject: [PATCH 10/16] not needed - no longer present --- roles/mysql/tasks/install.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/roles/mysql/tasks/install.yml b/roles/mysql/tasks/install.yml index 49250e70b..5b015cbdd 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -113,21 +113,21 @@ owner: root mode: '0600' -- name: Remove the MySQL 'test' database - mysql_db: - db: test - state: absent +#- name: Remove the MySQL 'test' database +# mysql_db: +# db: test +# state: absent -- name: Delete anonymous MySQL server user for {{ ansible_hostname }} - mysql_user: - user: "" - host: "{{ ansible_hostname }}" - state: absent +#- name: Delete anonymous MySQL server user for {{ ansible_hostname }} +# mysql_user: +# user: "" +# host: "{{ ansible_hostname }}" +# state: absent -- name: Delete anonymous MySQL server user for localhost - mysql_user: - user: "" - state: absent +#- name: Delete anonymous MySQL server user for localhost +# mysql_user: +# user: "" +# state: absent - name: Create MySQL root password for root accounts on (127.0.0.1, ::1) mysql_user: From 0c49b1eedf25acad2e85168c6fea1751d3888562 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 23 Aug 2020 22:02:46 -0500 Subject: [PATCH 11/16] disable root websockets --- roles/mysql/tasks/install.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/mysql/tasks/install.yml b/roles/mysql/tasks/install.yml index 5b015cbdd..3ab4f370e 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -129,15 +129,15 @@ # user: "" # state: absent -- name: Create MySQL root password for root accounts on (127.0.0.1, ::1) - mysql_user: - name: root - host: "{{ item }}" - password: "{{ mysql_root_password }}" - priv: "*.*:ALL,GRANT" - with_items: - - 127.0.0.1 - - ::1 +#- name: Create MySQL root password for root accounts on (127.0.0.1, ::1) +# mysql_user: +# name: root +# host: "{{ item }}" +# password: "{{ mysql_root_password }}" +# priv: "*.*:ALL,GRANT" +# with_items: +# - 127.0.0.1 +# - ::1 # RECORD MySQL AS INSTALLED From 76436d1fae9b25a80ba2dec1cbdd7f7773a81709 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 23 Aug 2020 22:20:24 -0500 Subject: [PATCH 12/16] pbx - adjust mysql_user --- roles/pbx/tasks/freepbx.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml index e4838ea87..4ba0c6b9e 100644 --- a/roles/pbx/tasks/freepbx.yml +++ b/roles/pbx/tasks/freepbx.yml @@ -49,9 +49,9 @@ name: "{{ asterisk_db_user }}" password: "{{ asterisk_db_password }}" priv: "{{ asterisk_db_dbname }}.*:ALL/{{ asterisk_db_cdrdbname }}.*:ALL" - login_host: "{{ asterisk_db_host }}" - login_user: "root" - login_password: "{{ mysql_root_password }}" +# login_host: "{{ asterisk_db_host }}" +# login_user: "root" +# login_password: "{{ mysql_root_password }}" host: "{{ (asterisk_db_host == 'localhost') | ternary('localhost', ansible_default_ipv4.address) }}" state: present @@ -60,9 +60,9 @@ name: "{{ asterisk_db_dbname }}" encoding: utf8 collation: utf8_general_ci - login_host: "{{ asterisk_db_host }}" - login_user: "root" - login_password: "{{ mysql_root_password }}" +# login_host: "{{ asterisk_db_host }}" +# login_user: "root" +# login_password: "{{ mysql_root_password }}" state: present - name: FreePBX - Add cdr mysql db From 33ebf3f8c3ee6d52f44acfcef34cc20428b598a4 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 23 Aug 2020 22:25:36 -0500 Subject: [PATCH 13/16] remove mysql_root_password variable --- roles/mysql/defaults/main.yml | 9 --------- vars/default_vars.yml | 2 -- 2 files changed, 11 deletions(-) delete mode 100644 roles/mysql/defaults/main.yml diff --git a/roles/mysql/defaults/main.yml b/roles/mysql/defaults/main.yml deleted file mode 100644 index 593d62931..000000000 --- a/roles/mysql/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -# MySQL MANDATORY - THESE 2 VARS HAVE NO EFFECT - SEE roles/0-init/tasks/main.yml & roles/mysql/tasks/main.yml -# mysql_install: True -# mysql_enabled: True - -## mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0 -# mysql_root_password: fixmysql - -# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml -# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 700f5c2f1..d731c05e9 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -243,8 +243,6 @@ admin_console_enabled: True # MySQL MANDATORY - THESE 2 VARS HAVE NO EFFECT - SEE roles/0-init/tasks/main.yml & roles/mysql/tasks/main.yml mysql_install: True mysql_enabled: True -# mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0 -mysql_root_password: fixmysql # 2019-01-13: IIAB's use of NGINX is still evolving -- please review this # evolving doc: https://github.com/iiab/iiab/blob/master/roles/nginx/README.md From 59c8ce764e9d79f7f0bd5b561dd634e1abc349b8 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 23 Aug 2020 22:21:24 -0500 Subject: [PATCH 14/16] Try localhost only for NC & Elgg --- roles/elgg/tasks/setup.yml | 4 ++-- roles/nextcloud/tasks/setup.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/elgg/tasks/setup.yml b/roles/elgg/tasks/setup.yml index d38811fca..f28086fd5 100644 --- a/roles/elgg/tasks/setup.yml +++ b/roles/elgg/tasks/setup.yml @@ -10,8 +10,8 @@ password: "{{ dbpassword }}" priv: "{{ dbname }}.*:ALL" with_items: - - 127.0.0.1 - - ::1 +# - 127.0.0.1 +# - ::1 - localhost - name: Create /tmp/elggdb.sql from template, to load database diff --git a/roles/nextcloud/tasks/setup.yml b/roles/nextcloud/tasks/setup.yml index b7dd2408e..73b52e0cc 100644 --- a/roles/nextcloud/tasks/setup.yml +++ b/roles/nextcloud/tasks/setup.yml @@ -9,8 +9,8 @@ password: "{{ nextcloud_dbpassword }}" priv: "{{ nextcloud_dbname }}.*:ALL,GRANT" with_items: - - 127.0.0.1 - - ::1 +# - 127.0.0.1 +# - ::1 - localhost From f0127ba1cc5e523eedcdacf13bf538ff8e20772a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 24 Aug 2020 08:19:09 -0400 Subject: [PATCH 15/16] Update README.md --- roles/nginx/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 5dd5a829c..092f4cc8e 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -45,8 +45,8 @@ * kalite (menu goes directly to ports 8006-8008) * minetest [*] * openvpn - * pbx [*] + * pbx [*, requires Apache for now, as in Section 3.] * phpmyadmin [*, requires Apache for now, as in Section 3.] * transmission [*] -[*] The 6 above starred roles could use improvement, as of 2020-05-21. +[*] The 6 above starred roles could use improvement, as of 2020-08-24. From b038ccb9c3f156214ff249d7e7ce3d91ff40d7c4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 24 Aug 2020 08:36:11 -0400 Subject: [PATCH 16/16] Update README.md --- roles/nginx/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 092f4cc8e..e7b1c6738 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -10,7 +10,7 @@ 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX. -3. Current state of IIAB App/Service migrations as of 2020-05-21: +3. Current state of IIAB App/Service migrations as of 2020-08-24: 1. These support "Native" NGINX but ***NOT*** Apache * Admin Console