mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-12-22 18:35:03 +01:00
Solved authentification bug and added draft for socket
This commit is contained in:
parent
27b5b3a74b
commit
8eed734ad0
@ -24,4 +24,4 @@ Configure the role by setting the required variables. These can be set in the pl
|
||||
- `database_password`: The password for the database user.
|
||||
|
||||
## Contributing
|
||||
Contributions to this project are welcome. Please submit issues and pull requests with your suggestions.
|
||||
Contributions to this project are welcome. Please submit issues and pull requests with your suggestions.
|
||||
|
@ -4,6 +4,11 @@
|
||||
state: present
|
||||
when: run_once_docker_mariadb is not defined
|
||||
|
||||
- name: Create a volume for MariaDB socket
|
||||
docker_volume:
|
||||
name: mariadb_socket
|
||||
when: run_once_docker_mariadb is not defined
|
||||
|
||||
- name: install MariaDB
|
||||
docker_container:
|
||||
name: central-mariadb
|
||||
@ -15,39 +20,42 @@
|
||||
networks:
|
||||
- name: central_mariadb_network
|
||||
volumes:
|
||||
- database:/var/lib/mysql
|
||||
- central_mariadb_database:/var/lib/mysql
|
||||
- central_mariadb_socket:/var/run/mysqld
|
||||
published_ports:
|
||||
- "127.0.0.1:3306:3306"
|
||||
- "127.0.0.1:3306:3306" # can be that this will be removed if all applications use sockets
|
||||
command: "--transaction-isolation=READ-COMMITTED --binlog-format=ROW" #for nextcloud
|
||||
when: run_once_docker_mariadb is not defined
|
||||
|
||||
- name: wait for availability of mariadb
|
||||
wait_for:
|
||||
host: "127.0.0.1"
|
||||
port: "3306"
|
||||
delay: 0
|
||||
timeout: 120
|
||||
when: run_once_docker_mariadb is not defined
|
||||
|
||||
- name: install python-mysqlclient
|
||||
pacman:
|
||||
name: python-mysqlclient
|
||||
state: present
|
||||
when: run_once_docker_mariadb is not defined
|
||||
|
||||
- name: wait for database
|
||||
wait_for:
|
||||
host: 127.0.0.1
|
||||
port: 3306
|
||||
delay: 10
|
||||
timeout: 300
|
||||
when: run_once_docker_mariadb is not defined
|
||||
|
||||
- name: create database
|
||||
mysql_db:
|
||||
name: "{{database_databasename}}"
|
||||
name: "{{ database_databasename }}"
|
||||
state: present
|
||||
login_user: root
|
||||
login_password: "{{central_mariadb_root_password}}"
|
||||
login_password: "{{ central_mariadb_root_password }}"
|
||||
login_host: 127.0.0.1
|
||||
login_port: 3306
|
||||
|
||||
|
||||
- name: create database user
|
||||
mysql_user:
|
||||
name: "{{database_username}}"
|
||||
password: "{{database_password}}"
|
||||
host: "%"
|
||||
priv: '{{database_databasename}}.*:ALL'
|
||||
state: present
|
||||
login_user: root
|
||||
|
@ -12,13 +12,14 @@ services:
|
||||
ports:
|
||||
- "127.0.0.1:{{http_port}}:80"
|
||||
environment:
|
||||
YOURLS_DB_HOST: "{{database_host}}:3306"
|
||||
YOURLS_DB_HOST: "{{database_host}}"
|
||||
YOURLS_DB_USER: "{{database_username}}"
|
||||
YOURLS_DB_PASS: "{{database_password}}"
|
||||
YOURLS_DB_NAME: "{{database_databasename}}"
|
||||
YOURLS_SITE: "https://{{domain}}"
|
||||
YOURLS_USER: "{{yourls_user}}"
|
||||
YOURLS_PASS: "{{yourls_user_password}}"
|
||||
|
||||
{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
|
||||
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||
|
||||
|
@ -1,5 +1,8 @@
|
||||
# This needs to be included in docker-compose.yml which just contain a database volume
|
||||
#volumes:
|
||||
{% if not enable_central_database | bool %}
|
||||
volumes:
|
||||
database:
|
||||
#{% else %}
|
||||
# mariadb_socket:
|
||||
{% endif %}
|
Loading…
Reference in New Issue
Block a user