mirror of
https://github.com/iiab/iiab.git
synced 2025-02-13 11:42:08 +00:00
Merge pull request #2895 from holta/openvpn-mysql-cleanup
Cleanup of roles/openvpn and roles/mysql
This commit is contained in:
commit
517820b64c
5 changed files with 8 additions and 7 deletions
|
@ -33,7 +33,7 @@
|
|||
- rsync
|
||||
#- screen # Installed by 1-prep's roles/iiab-admin/tasks/access.yml
|
||||
- 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
|
||||
- unzip
|
||||
#- usbmount # Moved to roles/usb_lib/tasks/install.yml
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# Stanzas as of 2020-05-21:
|
||||
# Stanzas as of 2021-08-02:
|
||||
#
|
||||
# - 1 base install
|
||||
# - 6 double timeout for slow CPUs
|
||||
# - 7 DB config
|
||||
# - 2 DB config
|
||||
# - 2 record as installed
|
||||
|
||||
- name: 'Install MySQL packages: mariadb-server, mariadb-client, php{{ php_version }}-mysql'
|
||||
|
@ -98,7 +98,7 @@
|
|||
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: Start MySQL systemd service ({{ mysql_service }}) to permit configuration
|
||||
|
@ -107,7 +107,7 @@
|
|||
daemon_reload: yes
|
||||
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:
|
||||
src: my.cnf.j2
|
||||
dest: /root/.my.cnf
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
- name: Install OpenVPN and Nmap packages
|
||||
- name: "Install packages: nmap, openvpn, sudo"
|
||||
package:
|
||||
name:
|
||||
- openvpn
|
||||
- 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
|
||||
|
||||
# Newer versions of NMap do not include NCat, needed to announce /etc/iiab/openvpn_handle
|
||||
|
|
Loading…
Reference in a new issue