[odrs-web] sed (on run-httpd) won't run if /etc/httpd/conf is not chowned properly
- From: Andrea Veri <averi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [odrs-web] sed (on run-httpd) won't run if /etc/httpd/conf is not chowned properly
- Date: Mon, 17 Dec 2018 12:06:33 +0000 (UTC)
commit b9c416073010f179e71360d8c7f62a20d23c47d3
Author: Andrea Veri <averi redhat com>
Date: Mon Dec 17 13:06:10 2018 +0100
sed (on run-httpd) won't run if /etc/httpd/conf is not chowned properly
Dockerfile | 1 +
entrypoint.sh | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index 5a7b17c..097e24a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,7 @@ RUN python /opt/app-root/src/cron.py ratings /opt/app-root/src/app/static/rating
RUN chown -R 1000310000:0 ${ODRS_HOME} && \
chmod -R 664 ${ODRS_HOME} && \
chown -R 1000310000:0 /etc/httpd/sites.d && \
+ chown 1000310000:0 /etc/httpd/conf && \
find ${ODRS_HOME} -type d -exec chmod 775 {} +
COPY entrypoint.sh /usr/local/bin
diff --git a/entrypoint.sh b/entrypoint.sh
index 79f18ba..65835d8 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,10 +1,10 @@
#!/bin/sh
-#sed -i "s/replace_odrs_secret/${ODRS_REVIEWS_SECRET}/" /etc/httpd/sites.d/odrs.gnome.org.conf
-#sed -i "s/replace_odrs_username/${MYSQL_DB_USERNAME}/" /etc/httpd/sites.d/odrs.gnome.org.conf
-#sed -i "s/replace_odrs_password/${MYSQL_DB_PASSWORD}/" /etc/httpd/sites.d/odrs.gnome.org.conf
-#sed -i "s/replace_odrs_host/${MYSQL_DB_HOST}/" /etc/httpd/sites.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_secret/${ODRS_REVIEWS_SECRET}/" /etc/httpd/sites.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_username/${MYSQL_DB_USERNAME}/" /etc/httpd/sites.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_password/${MYSQL_DB_PASSWORD}/" /etc/httpd/sites.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_host/${MYSQL_DB_HOST}/" /etc/httpd/sites.d/odrs.gnome.org.conf
-#while true; do python /opt/app-root/src/cron.py ratings /opt/app-root/src/app/static/ratings.json ; sleep
43200 ; done &
+while true; do python /opt/app-root/src/cron.py ratings /opt/app-root/src/app/static/ratings.json ; sleep
43200 ; done &
exec /usr/bin/run-httpd
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]