diff --git a/states/gnuviechadmin/gvamysql/celery-worker.env b/states/gnuviechadmin/gvamysql/celery-worker.env index ae3b43c..1fdf273 100644 --- a/states/gnuviechadmin/gvamysql/celery-worker.env +++ b/states/gnuviechadmin/gvamysql/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 }}" diff --git a/states/gnuviechadmin/gvaweb/celery-worker.env b/states/gnuviechadmin/gvaweb/celery-worker.env index af6b2d2..31b01f1 100644 --- a/states/gnuviechadmin/gvaweb/celery-worker.env +++ b/states/gnuviechadmin/gvaweb/celery-worker.env @@ -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') }}"