mirror of
https://git.cloudron.io/cloudron/prometheus-server-app.git
synced 2024-11-21 16:01:03 +00:00
Remove apache auth. it is now in the platform code
This commit is contained in:
parent
667799fdd4
commit
ce27acde4c
3 changed files with 1 additions and 50 deletions
|
@ -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 && \
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
<VirtualHost *:8000>
|
||||
DocumentRoot /usr/local/bin/prometheus
|
||||
|
||||
ErrorLog "/dev/stderr"
|
||||
CustomLog "/dev/stdout" combined
|
||||
|
||||
<Location />
|
||||
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/
|
||||
</Location>
|
||||
|
||||
<Location /healthcheck>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
Satisfy Any
|
||||
|
||||
ErrorDocument 200 "ok"
|
||||
RewriteEngine On
|
||||
RewriteRule "/healthcheck" - [R=200]
|
||||
</Location>
|
||||
|
||||
</VirtualHost>
|
7
start.sh
7
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
|
||||
exec /usr/local/bin/gosu cloudron:cloudron ./prometheus --config.file=/app/data/config/prometheus.yml --storage.tsdb.path=/app/data/runtime
|
||||
|
|
Loading…
Reference in a new issue