aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMat Booth <mat.booth@redhat.com>2018-03-16 17:48:38 +0000
committerMat Booth <mat.booth@redhat.com>2018-03-16 17:48:38 +0000
commit6c6fc4bb941642f6238e74121292ad7c382d0e47 (patch)
treef974281c7809c114041f0dc39a2f5b3d2bc8463b
parent9d7ff370276ccbcecb512140d535a74b9fa7464f (diff)
downloaddarkpeak-services-6c6fc4bb941642f6238e74121292ad7c382d0e47.tar.gz
darkpeak-services-6c6fc4bb941642f6238e74121292ad7c382d0e47.tar.xz
darkpeak-services-6c6fc4bb941642f6238e74121292ad7c382d0e47.zip
trac: Few tweaks to trac configuration
-rw-r--r--roles/trac/defaults/main.yml3
-rw-r--r--roles/trac/templates/apache.incl.conf.j22
-rw-r--r--roles/trac/templates/trac.ini.j212
3 files changed, 11 insertions, 6 deletions
diff --git a/roles/trac/defaults/main.yml b/roles/trac/defaults/main.yml
index 05f2c6f..58a615b 100644
--- a/roles/trac/defaults/main.yml
+++ b/roles/trac/defaults/main.yml
@@ -18,3 +18,6 @@ postgresql_databases:
owner: "{{ postgresql_users[0].name }}"
lc_collate: en_GB.UTF-8
lc_ctype: en_GB.UTF-8
+
+trac_db: "postgres://{{ postgresql_users[0].name }}:{{ postgresql_users[0].password }}@/{{ postgresql_databases[0].name }}?host=/var/run/postgresql"
+
diff --git a/roles/trac/templates/apache.incl.conf.j2 b/roles/trac/templates/apache.incl.conf.j2
index 00b8e58..c59a860 100644
--- a/roles/trac/templates/apache.incl.conf.j2
+++ b/roles/trac/templates/apache.incl.conf.j2
@@ -1,3 +1,5 @@
+Alias /chrome {{ web_root }}/htdocs
+
WSGIScriptAlias / {{ web_root }}/cgi-bin/trac.wsgi
WSGIDaemonProcess {{ subdomain }} maximum-requests=2 user={{ service_name }} group={{ service_name }}
WSGIProcessGroup {{ subdomain }}
diff --git a/roles/trac/templates/trac.ini.j2 b/roles/trac/templates/trac.ini.j2
index 7c7665c..8727a77 100644
--- a/roles/trac/templates/trac.ini.j2
+++ b/roles/trac/templates/trac.ini.j2
@@ -26,7 +26,7 @@ wiki_format_messages = enabled
trac.wiki.web_ui.* = disabled
[header_logo]
-alt = Dark Peak Issue Tracker
+alt = Dark Peak Logo
height = -1
link = https://{{ domain }}/
src = site/darkpeak-logo.png
@@ -116,7 +116,7 @@ admin_trac_url = .
descr = Dark Peak Data Co-op Issue Tracker
footer =
icon = site/favicon.ico
-name = Dark Peak Issue Tracker
+name = Dark Peak Issues
url =
[query]
@@ -196,8 +196,8 @@ abbreviated_messages = enabled
changeset_collapse_events = disabled
changeset_long_messages = disabled
changeset_show_files = 0
-default_daysback = 30
-max_daysback = 90
+default_daysback = 90
+max_daysback = 365
newticket_formatter = oneliner
ticket_show_component = disabled
ticket_show_details = disabled
@@ -211,7 +211,7 @@ auto_reload = disabled
backup_dir = db
base_url =
check_auth_ip = disabled
-database = postgres://trac:correcthorsebatterystaple@/trac?host=/var/run/postgresql
+database = {{ trac_db }}
debug_sql = disabled
default_charset = utf-8
default_date_format =
@@ -231,7 +231,7 @@ permission_store = DefaultPermissionStore
pg_dump_path = pg_dump
request_filters =
resizable_textareas = enabled
-secure_cookies = disabled
+secure_cookies = enabled
show_email_addresses = disabled
show_full_names = enabled
show_ip_addresses = disabled