Commit b6592da4 authored by Johannes Zellner's avatar Johannes Zellner

Allow with and without ldap

parent 7bc31cc2
......@@ -28,7 +28,7 @@ COPY apache/mpm_prefork.conf /etc/apache2/mods-available/mpm_prefork.conf
RUN a2disconf other-vhosts-access-log
RUN a2enconf php7.2-fpm
COPY apache/alltube.conf.template /app/pkg/alltube.conf.template
COPY apache/alltube.conf.ldap apache/alltube.conf.noldap /app/pkg/
RUN ln -s /run/alltube.conf /etc/apache2/sites-enabled/alltube.conf
RUN echo "Listen 80" > /etc/apache2/ports.conf
......
......@@ -7,8 +7,8 @@
<Location />
AllowOverride None
Order deny,allow
Deny from all
Order deny,allow
Deny from all
AuthType Basic
AuthBasicProvider ldap
......
<VirtualHost *:80>
DocumentRoot /app/code
ErrorLog "/dev/stderr"
CustomLog "/dev/stdout" combined
<Directory /app/code/>
Options +FollowSymLinks
AllowOverride All
Require all granted
</Directory>
<Location /healthcheck>
Order allow,deny
Allow from all
Satisfy Any
ErrorDocument 200 "ok"
RewriteEngine On
RewriteRule "/healthcheck" - [R=200]
</Location>
</VirtualHost>
......@@ -22,8 +22,13 @@ if [[ ! -f /app/data/config.yml ]]; then
sed -i "s,appName:.*,appName: Cloudron Alltube Download," /app/data/config.yml
fi
echo "=> Generate alltube apache config"
cp /app/pkg/alltube.conf.template /run/alltube.conf
if [[ -n "${CLOUDRON_LDAP_SERVER:-}" ]]; then
echo "=> Generate alltube apache config with LDAP"
cp /app/pkg/alltube.conf.ldap /run/alltube.conf
else
echo "=> Generate alltube apache config without LDAP"
cp /app/pkg/alltube.conf.noldap /run/alltube.conf
fi
echo "=> Ensuring permissions"
chown -R www-data.www-data /app/data /run /tmp
......
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