aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2014-06-12 16:57:41 +0200
committerMilo Casagrande <milo.casagrande@linaro.org>2014-06-12 16:57:41 +0200
commit914d18b875e7ebcf82264bcaa3030c1daadc5021 (patch)
tree3d9757cee158017c8ff4bb91e608cab559464a20
parent37474f696485caf64568fba1da09b60b493f737c (diff)
downloadlinaro-bugzilla-tools-914d18b875e7ebcf82264bcaa3030c1daadc5021.tar.gz
Small fixed to apache conf and postgres commands.
Change-Id: I4c343a8f4f0b1b9409450d32a077c6ede8e8ce9b
-rw-r--r--ansible/roles/configure-apache/templates/production.conf5
-rw-r--r--ansible/roles/configure-db/tasks/main.yml21
2 files changed, 18 insertions, 8 deletions
diff --git a/ansible/roles/configure-apache/templates/production.conf b/ansible/roles/configure-apache/templates/production.conf
index ed9337c..fd3fff4 100644
--- a/ansible/roles/configure-apache/templates/production.conf
+++ b/ansible/roles/configure-apache/templates/production.conf
@@ -38,8 +38,9 @@
!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:\
CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA"
- SSLCertificateFile /etc/ssl/certs/{{ hostname }}.pem
- SSLCertificateKeyFile /etc/ss/private/{{ hostname }}.key
+ SSLCertificateFile /etc/ssl/certs/wildcard.linaro.org.crt
+ SSLCertificateKeyFile /etc/ssl/private/wildcard.linaro.org.key
+ SSLCACertificateFile /etc/ssl/certs/gd_bundle-g2-g1.pem
<FilesMatch "\.(cgi|shtml|phtml|php)$">
SSLOptions +StdEnvVars
diff --git a/ansible/roles/configure-db/tasks/main.yml b/ansible/roles/configure-db/tasks/main.yml
index 03f7f2c..587af35 100644
--- a/ansible/roles/configure-db/tasks/main.yml
+++ b/ansible/roles/configure-db/tasks/main.yml
@@ -1,11 +1,20 @@
---
-- name: Create PostgreSQL bugzilla user
- postgresql_user: name={{ db_user }}
- password={{ db_pass }}
- state=present
+# Need to always define 'sudo_user: postgres' or it will not work!
- name: Create PostgreSQL bugzilla database
postgresql_db: name={{ db_name }}
- owner={{ db_user }}
- state=present
+ template=template0
+ encoding=UTF8
+ sudo_user: postgres
+ tags:
+ - db
+- name: Create PostgreSQL bugzilla user
+ postgresql_user: name={{ db_user }}
+ role_attr_flags=NOSUPERUSER,NOCREATEDB
+ password={{ db_pass }}
+ db={{ db_name }}
+ priv=ALL
+ sudo_user: postgres
+ tags:
+ - db