[odrs-web] Don't use sed for environ substitution
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [odrs-web] Don't use sed for environ substitution
- Date: Mon, 1 Jul 2019 11:26:22 +0000 (UTC)
commit 3ed6ba5614cbd26114e6fa130180d5e875e6ae5e
Author: Richard Hughes <richard hughsie com>
Date: Mon Jul 1 12:22:21 2019 +0100
Don't use sed for environ substitution
app_data/httpd-cfg/odrs.gnome.org.conf | 4 ++--
app_data/httpd-pre-init/entrypoint.sh | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/app_data/httpd-cfg/odrs.gnome.org.conf b/app_data/httpd-cfg/odrs.gnome.org.conf
index 664341d..bfbd304 100644
--- a/app_data/httpd-cfg/odrs.gnome.org.conf
+++ b/app_data/httpd-cfg/odrs.gnome.org.conf
@@ -15,8 +15,8 @@
WSGIScriptAlias / /opt/app-root/src/wsgi-scripts/odrs.wsgi
- SetEnv ODRS_REVIEWS_SECRET replace_odrs_secret
- SetEnv SQLALCHEMY_DATABASE_URI replace_odrs_database_uri
+ SetEnv ODRS_REVIEWS_SECRET %{ENV:ODRS_REVIEWS_SECRET}
+ SetEnv SQLALCHEMY_DATABASE_URI %{ENV:SQLALCHEMY_DATABASE_URI}
<Location /static/>
ExpiresActive On
diff --git a/app_data/httpd-pre-init/entrypoint.sh b/app_data/httpd-pre-init/entrypoint.sh
index 588eca9..7656ee8 100755
--- a/app_data/httpd-pre-init/entrypoint.sh
+++ b/app_data/httpd-pre-init/entrypoint.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-sed -i "s/replace_odrs_secret/${ODRS_REVIEWS_SECRET}/" ${HTTPD_CONFIGURATION_PATH}/odrs.gnome.org.conf
-sed -i "s/replace_odrs_database_uri/${SQLALCHEMY_DATABASE_URI}/"
${HTTPD_CONFIGURATION_PATH}/odrs.gnome.org.conf
-
while true; do python36 /opt/app-root/src/cron.py ratings /opt/app-root/src/odrs/static/ratings.json ; sleep
43200 ; done &
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]