Commit 7df117e3 authored by Thomas Downes's avatar Thomas Downes Committed by Tanner Prestegard

Explicitly set LVAalert Overseer Resource to randomized string

parent 064d0c13
......@@ -34,6 +34,7 @@ RUN apt-get update && \
apt-get clean && \
npm install -g bower
COPY docker/entrypoint /usr/local/bin/entrypoint
COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
COPY docker/supervisord-apache2.conf /etc/supervisor/conf.d/apache2.conf
COPY docker/supervisord-lvalert-overseer.conf /etc/supervisor/conf.d/overseer.conf
......@@ -92,9 +93,11 @@ RUN useradd -M -u 50001 -g www-data -s /bin/false gracedb
# set secure file/directory permissions. In particular, ADD command at
# beginning of recipe inherits umask of user running the build
RUN chown gracedb:www-data /app/logs /app/project_data && \
RUN chmod 0755 /usr/local/bin/entrypoint && \
chown gracedb:www-data /app/logs /app/project_data && \
chmod 0750 /app/logs /app/project_data && \
find /app/gracedb_project -type d -exec chmod 0755 {} + && \
find /app/gracedb_project -type f -exec chmod 0644 {} +
ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
#!/bin/bash
export LVALERT_OVERSEER_RESOURCE=${LVALERT_USER}_overseer_$(python -c 'import uuid; print(uuid.uuid4().hex)')
exec "$@"
[program:overseer]
command=lvalert_overseer -a %(ENV_LVALERT_USER)s -b %(ENV_LVALERT_PASSWORD)s
-s %(ENV_LVALERT_SERVER)s -p %(ENV_LVALERT_OVERSEER_PORT)s
-r %(ENV_LVALERT_OVERSEER_RESOURCE)s
-l /tmp/overseer_stdout.log -e /tmp/overseer_stderr.log
user=gracedb
group=www-data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment