Merge remote-tracking branch 'origin/disable-rainloop-admin'

master
Tim Möhlmann 6 years ago
commit c2f3966604
No known key found for this signature in database
GPG Key ID: 8677988D8072E8DE

@ -27,7 +27,7 @@ RUN apt-get update && apt-get install -y \
COPY include.php /var/www/html/include.php
COPY php.ini /php.ini
COPY config.ini /config.ini
COPY application.ini /application.ini
COPY default.ini /default.ini
COPY start.py /start.py

@ -15,5 +15,5 @@ function __get_custom_data_full_path()
*/
function __get_additional_configuration_name()
{
return 'config.ini';
return 'application.ini';
}

@ -20,7 +20,7 @@ os.makedirs(base + "domains", exist_ok=True)
os.makedirs(base + "configs", exist_ok=True)
convert("/default.ini", "/data/_data_/_default_/domains/default.ini")
convert("/config.ini", "/data/_data_/_default_/configs/config.ini")
convert("/application.ini", "/data/_data_/_default_/configs/application.ini")
convert("/php.ini", "/usr/local/etc/php/conf.d/rainloop.ini")
os.system("chown -R www-data:www-data /data")

Loading…
Cancel
Save