external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2895 from holta/openvpn-mysql-cleanup

Browse source 
Cleanup of roles/openvpn and roles/mysql
This commit is contained in:
A Holt 2021-08-02 15:24:32 -04:00 committed by GitHub
commit 517820b64c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/2-common/tasks/packages.yml
View file

@ -33,7 +33,7 @@
- rsync - rsync
#- screen # Installed by 1-prep's roles/iiab-admin/tasks/access.yml #- screen # Installed by 1-prep's roles/iiab-admin/tasks/access.yml
- sqlite3 - sqlite3
- sudo - sudo # Should already be installed (prior to installing IIAB) but let's also make it explicit here. Can also be installed by roles/1-prep/main.yml -> roles/openvpn/tasks/install.yml
- tar - tar
- unzip - unzip
#- usbmount # Moved to roles/usb_lib/tasks/install.yml #- usbmount # Moved to roles/usb_lib/tasks/install.yml

0
roles/mysql/tasks/centos.yml → roles/mysql/tasks/centos.yml.unused
View file

0
roles/mysql/tasks/fedora.yml → roles/mysql/tasks/fedora.yml.unused
View file

8
roles/mysql/tasks/install.yml
View file

@ -1,8 +1,8 @@
# Stanzas as of 2020-05-21: # Stanzas as of 2021-08-02:
# #
# - 1 base install # - 1 base install
# - 6 double timeout for slow CPUs # - 6 double timeout for slow CPUs
# - 7 DB config # - 2 DB config
# - 2 record as installed # - 2 record as installed
- name: 'Install MySQL packages: mariadb-server, mariadb-client, php{{ php_version }}-mysql' - name: 'Install MySQL packages: mariadb-server, mariadb-client, php{{ php_version }}-mysql'
@ -98,7 +98,7 @@
when: mariadb_unit_file.stat.exists when: mariadb_unit_file.stat.exists
# 7 STANZAS BELOW...could later be put into setup.yml or config.yml or or provision.yml ? # 2 STANZAS BELOW...could later be put into setup.yml or config.yml or or provision.yml ?
# Name of MySQL service varies by OS, so hardcoded in /opt/iiab/iiab/vars/<OS>.yml (formerly in roles/0-init/tasks/main.yml) # Name of MySQL service varies by OS, so hardcoded in /opt/iiab/iiab/vars/<OS>.yml (formerly in roles/0-init/tasks/main.yml)
- name: Start MySQL systemd service ({{ mysql_service }}) to permit configuration - name: Start MySQL systemd service ({{ mysql_service }}) to permit configuration
@ -107,7 +107,7 @@
daemon_reload: yes daemon_reload: yes
state: restarted state: restarted
- name: Install /root/.my.cnf file from template, with root password credentials - name: "Install /root/.my.cnf file from template -- used to contain root password credential, prior to 2020-08-24: https://github.com/iiab/iiab/pull/2488"
template: template:
src: my.cnf.j2 src: my.cnf.j2
dest: /root/.my.cnf dest: /root/.my.cnf

5
roles/openvpn/tasks/install.yml
View file

@ -1,8 +1,9 @@
- name: Install OpenVPN and Nmap packages - name: "Install packages: nmap, openvpn, sudo"
package: package:
name: name:
- openvpn
- nmap - nmap
- openvpn
- sudo # Should already be installed (prior to installing IIAB) but let's also make it explicit here. See also roles/2-common/tasks/packages.yml
state: present state: present
# Newer versions of NMap do not include NCat, needed to announce /etc/iiab/openvpn_handle # Newer versions of NMap do not include NCat, needed to announce /etc/iiab/openvpn_handle