diff --git a/Dockerfile b/Dockerfile index 401cf0a..5a6da0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,14 +7,6 @@ RUN mkdir -p /app/data/runtime /app/data/config && \ WORKDIR /app/data -# configure apache -RUN rm /etc/apache2/sites-enabled/* -RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf -RUN a2disconf other-vhosts-access-log -ADD apache/prometheus.conf /etc/apache2/sites-enabled/prometheus.conf -RUN echo "Listen 8000" > /etc/apache2/ports.conf -RUN a2enmod ldap authnz_ldap proxy proxy_http rewrite - # install Prometheus RUN mkdir -p /usr/local/bin/prometheus && \ cd /usr/local/bin && \ diff --git a/apache/prometheus.conf b/apache/prometheus.conf deleted file mode 100644 index 2e4c194..0000000 --- a/apache/prometheus.conf +++ /dev/null @@ -1,36 +0,0 @@ - - DocumentRoot /usr/local/bin/prometheus - - ErrorLog "/dev/stderr" - CustomLog "/dev/stdout" combined - - - AllowOverride None - Order deny,allow - Deny from All - - AuthType Basic - AuthBasicProvider ldap - AuthName "Use your Cloudron Account to login" - AuthLDAPURL ${CLOUDRON_LDAP_URL}/${CLOUDRON_LDAP_USERS_BASE_DN}?username?sub?(objectclass=user) - AuthLDAPBindDN "${CLOUDRON_LDAP_BIND_DN}" - AuthLDAPBindPassword "{CLOUDRON_LDAP_BIND_PASSWORD}" - Require valid-user - Satisfy any - - ProxyPreserveHost On - ProxyErrorOverride Off - ProxyPass http://127.0.0.1:9090/ - - - - Order allow,deny - Allow from all - Satisfy Any - - ErrorDocument 200 "ok" - RewriteEngine On - RewriteRule "/healthcheck" - [R=200] - - - diff --git a/start.sh b/start.sh index dd51f61..b59d3db 100644 --- a/start.sh +++ b/start.sh @@ -2,11 +2,6 @@ set -eu -echo "=> Starting apache" -APACHE_CONFDIR="" source /etc/apache2/envvars -rm -f "${APACHE_PID_FILE}" -/usr/sbin/apache2 -DFOREGROUND & - echo "=> Starting Prometheus" cd /usr/local/bin/prometheus -exec /usr/local/bin/gosu cloudron:cloudron ./prometheus --config.file=/app/data/config/prometheus.yml --storage.tsdb.path=/app/data/runtime \ No newline at end of file +exec /usr/local/bin/gosu cloudron:cloudron ./prometheus --config.file=/app/data/config/prometheus.yml --storage.tsdb.path=/app/data/runtime