diff --git a/tutor/templates/apps/mysql/auth.env b/tutor/templates/apps/mysql/auth.env index 8d4ea4a428d8efca5d60338331d1136163504645..db5d3460ead84041c881e2e83742ea97813b3efa 100644 --- a/tutor/templates/apps/mysql/auth.env +++ b/tutor/templates/apps/mysql/auth.env @@ -1 +1,4 @@ MYSQL_ROOT_PASSWORD={{ MYSQL_ROOT_PASSWORD }} +OPENEDX_MYSQL_DATABASE={{ OPENEDX_MYSQL_DATABASE }} +OPENEDX_MYSQL_USERNAME={{ OPENEDX_MYSQL_USERNAME }} +OPENEDX_MYSQL_PASSWORD={{ OPENEDX_MYSQL_PASSWORD }} diff --git a/tutor/templates/apps/mysql/my.cnf b/tutor/templates/apps/mysql/my.cnf new file mode 100644 index 0000000000000000000000000000000000000000..124301944008fdb3f451d754be340014555515d3 --- /dev/null +++ b/tutor/templates/apps/mysql/my.cnf @@ -0,0 +1,11 @@ +[mysqld] +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +log-error = /var/log/mysql/error.log + +symbolic-links=0 +skip-host-cache +skip-name-resolve +character-set-server=utf8 +collation-server=utf8_general_ci diff --git a/tutor/templates/k8s/configmap.yml b/tutor/templates/k8s/configmap.yml deleted file mode 100644 index 53c180edbd57cb98ada0d6e7c6dd29e6cae87e7a..0000000000000000000000000000000000000000 --- a/tutor/templates/k8s/configmap.yml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - my.cnf: "[mysqld]\npid-file\t= /var/run/mysqld/mysqld.pid\nsocket\t\t= /var/run/mysqld/mysqld.sock\ndatadir\t\t= - /var/lib/mysql\nlog-error\t= /var/log/mysql/error.log\n# Disabling symbolic-links - is recommended to prevent assorted security risks\nsymbolic-links=0\nskip-host-cache\nskip-name-resolve\ncharacter-set-server=utf8\ncollation-server=utf8_general_ci\n" -kind: ConfigMap -metadata: - name: mysql-cnf diff --git a/tutor/templates/kustomization.yml b/tutor/templates/kustomization.yml index 0743d840cb242ecde0d6a66fee193dbf4bbc981e..2dd8b765839c7313bff9c9806b6fc29273f1fe2b 100644 --- a/tutor/templates/kustomization.yml +++ b/tutor/templates/kustomization.yml @@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - k8s/namespace.yml -- k8s/configmap.yml - k8s/deployments.yml - k8s/ingress.yml - k8s/jobs.yml @@ -38,6 +37,8 @@ configMapGenerator: - {{ file }}{% endfor %} - name: mysql-config env: apps/mysql/auth.env +- name: mysql-cnf + env: apps/mysql/my.cnf {{ patch("kustomization-configmapgenerator") }} {{ patch("kustomization") }}