ansible/xoxys.droneci
1
0
Fork 0
Code Issues Pull Requests Releases Activity

small fixes

Browse Source
This commit is contained in:
Robert Kaussow 2018-12-13 23:59:43 +01:00
parent 00c06aa47f
commit 1c4e8038f1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -13,8 +13,7 @@ droneci_agent_image: "drone/agent:{{ droneci_version }}"
droneci_agent_restart_policy: always droneci_agent_restart_policy: always
droneci_postgres_enabled: False droneci_postgres_enabled: False
droneci_postgres_tls_enabled: False droneci_postgres_ssl_mode: disable
# droneci_postgres_ssl_mode: disabled
droneci_postgres_server: postgres.example.com:5432 droneci_postgres_server: postgres.example.com:5432
droneci_postgres_superuser: postgres droneci_postgres_superuser: postgres
droneci_postgres_password: secure droneci_postgres_password: secure
@ -62,7 +61,7 @@ droneci_tls_cert_source: mycert.pem
droneci_tls_key_source: mykey.pem droneci_tls_key_source: mykey.pem
droneci_nginx_vhost_enabled: False droneci_nginx_vhost_enabled: False
openhab_nginx_tls_enabled: True droneci_nginx_tls_enabled: True
droneci_nginx_server: myinventoryname droneci_nginx_server: myinventoryname
droneci_nginx_vhost_dir: /etc/nginx/sites-available droneci_nginx_vhost_dir: /etc/nginx/sites-available
droneci_nginx_vhost_symlink: /etc/nginx/sites-enabled droneci_nginx_vhost_symlink: /etc/nginx/sites-enabled

2
templates/services/droneci-compose.yml.j2
View File

@ -24,7 +24,7 @@ services:
{% endif %} {% endif %}
{% if droneci_postgres_persistence_enabled %} {% if droneci_postgres_persistence_enabled %}
- DRONE_DATABASE_DRIVER=postgres - DRONE_DATABASE_DRIVER=postgres
- DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_postgres_user.name }}:{{ droneci_postgres_user.password }}@{{ droneci_postgres_server }}/{{ droneci_postgres_db.name }}{% if not droneci_postgres_tls_enabled %}?sslmode=disable{% endif %} - DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_postgres_user.name }}:{{ droneci_postgres_user.password }}@{{ droneci_postgres_server }}/{{ droneci_postgres_db.name }}{% if not droneci_postgres_tls_enabled %}?sslmode={{ droneci_postgres_ssl_mode }}{% endif %}
{% endif %} {% endif %}
{% if droneci_gitea_enabled %} {% if droneci_gitea_enabled %}
- DRONE_GITEA=true - DRONE_GITEA=true