Sort env files to allow easier merges

master
Jan Dittberner 3 years ago
parent 078fa1dbff
commit 3ab7cc2e4c
  1. 4
      states/gnuviechadmin/gvamysql/celery-worker.env
  2. 2
      states/gnuviechadmin/gvaweb/celery-worker.env

@ -1,6 +1,6 @@
GVAMYSQL_BROKER_URL='{{ broker_url }}'
GVAMYSQL_RESULTS_REDIS_URL="{{ result_url }}"
GVAMYSQL_DBADMIN_HOST="{{ salt['pillar.get']('gnuviechadmin:gvamysql:mysql_admin_host', 'localhost') }}"
GVAMYSQL_DBADMIN_PASSWORD="{{ salt['pillar.get']('gnuviechadmin:gvamysql:mysql_admin_password') }}"
GVAMYSQL_DBADMIN_PORT="{{ salt['pillar.get']('gnuviechadmin:gvamysql:mysql_admin_port', 3306) }}"
GVAMYSQL_DBADMIN_USER="{{ salt['pillar.get']('gnuviechadmin:gvamysql:mysql_admin_user', 'gvamysql') }}"
GVAMYSQL_DBADMIN_PASSWORD="{{ salt['pillar.get']('gnuviechadmin:gvamysql:mysql_admin_password') }}"
GVAMYSQL_RESULTS_REDIS_URL="{{ result_url }}"

@ -1,5 +1,5 @@
GVAWEB_BROKER_URL="{{ broker_url }}"
GVAWEB_RESULTS_REDIS_URL="{{ result_url }}"
GVAWEB_NGINX_SITES_AVAILABLE="{{ salt['pillar.get']('gnuviechadmin:gvaweb:nginx_sites_available', '/etc/nginx/sites-available') }}"
GVAWEB_NGINX_SITES_ENABLED="{{ salt['pillar.get']('gnuviechadmin:gvaweb:nginx_sites_enabled', '/etc/nginx/sites-enabled') }}"
GVAWEB_RESULTS_REDIS_URL="{{ result_url }}"
GVAWEB_WWWUSER_MOUNT="{{ salt['pillar.get']('gnuviechadmin:gvaweb:wwwuser_mount', '/srv/wwwfiles') }}"

Loading…
Cancel
Save