From 3ce2a2a84ac178311d41c3a790ff2b41d47c11e2 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Thu, 5 Jun 2014 03:37:04 +0000
Subject: [PATCH] cleaning up a commented out variable and the variable name
 for resultsdb-frontend flask secret key

---
 .../templates/rdb-settings.py.j2              |  6 ----
 .../templates/resultsdb.conf.j2               | 30 -------------------
 .../templates/settings.py.j2                  |  5 ++--
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 roles/taskotron/resultsdb-frontend/templates/rdb-settings.py.j2
 delete mode 100644 roles/taskotron/resultsdb-frontend/templates/resultsdb.conf.j2

diff --git a/roles/taskotron/resultsdb-frontend/templates/rdb-settings.py.j2 b/roles/taskotron/resultsdb-frontend/templates/rdb-settings.py.j2
deleted file mode 100644
index 5db81eec41..0000000000
--- a/roles/taskotron/resultsdb-frontend/templates/rdb-settings.py.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-SECRET_KEY = '{{ resultsdb_secret_key }}'
-SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ resultsdb_db_user }}:{{ resultsdb_db_password }}@{{ resultsdb_db_host }}:{{ resultsdb_db_port }}/{{ resultsdb_db_name }}'
-FILE_LOGGING = False
-LOGFILR = '/var/log/resultsdb/resultsdb.log'
-SYSLOG_LOGGING = False
-STREAM_LOGGING = True
diff --git a/roles/taskotron/resultsdb-frontend/templates/resultsdb.conf.j2 b/roles/taskotron/resultsdb-frontend/templates/resultsdb.conf.j2
deleted file mode 100644
index 675bf804cc..0000000000
--- a/roles/taskotron/resultsdb-frontend/templates/resultsdb.conf.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-WSGIDaemonProcess resultsdb user=apache group=apache threads=5
-WSGIScriptAlias {{ resultsdb_endpoint }} /usr/share/resultsdb/resultsdb.wsgi
-WSGISocketPrefix run/wsgi
-
-# this isn't the best way to force SSL but it works for now
-#RewriteEngine On
-#RewriteCond %{HTTPS} !=on
-#RewriteRule ^/resultsdb/admin/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-
-<Directory /usr/share/resultsdb>
-    WSGIProcessGroup resultsdb
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIScriptReloading On
-    <IfModule mod_authz_core.c>
-        # Apache 2.4
-        Require all granted
-    </IfModule>
-    <IfModule !mod_auth_core.c>
-        Order allow,deny
-        Allow from all
-    </IfModule>
-
-</Directory>
-
-#Alias /resultsdb/static /var/www/resultsdb/resultsdb/static
-
-#<Directory /var/www/resultsdb/resultsdb/static>
-#Order allow,deny
-#Allow from all
-#</Directory>
diff --git a/roles/taskotron/resultsdb-frontend/templates/settings.py.j2 b/roles/taskotron/resultsdb-frontend/templates/settings.py.j2
index d619d95305..5a70133800 100644
--- a/roles/taskotron/resultsdb-frontend/templates/settings.py.j2
+++ b/roles/taskotron/resultsdb-frontend/templates/settings.py.j2
@@ -1,8 +1,7 @@
 # while you can use this as a template, we recommend that you use the blockerbugs
 # cli to generate a config file
-#RDB_URL = 'http://{{ hostname }}/{{ resultsdb_endpoint }}/api/v1.0'
-RDB_URL = 'http://localhost/{{ resultsdb_endpoint }}/api/v1.0'
-SECRET_KEY = '{{ resultsdb_fe_secret_key }}'
+RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v1.0'
+SECRET_KEY = '{{ resultsdb_frontend_secret_key }}'
 FILE_LOGGING = False
 LOGFILR = '/var/log/resultsdb_frontend/resultsdb_frontend.log'
 SYSLOG_LOGGING = False