diff --git a/deploy/apache/docker-entrypoint b/deploy/apache/docker-entrypoint index d565073d75e8..b0f26dafaadd 100644 --- a/deploy/apache/docker-entrypoint +++ b/deploy/apache/docker-entrypoint @@ -133,6 +133,9 @@ echo "Deny from all" > /var/www/html/AVideo/.compose/.htaccess echo "entrypoint -- Running updatedb script..." cd /var/www/html/AVideo/install && php updatedb.php +echo "entrypoint -- install database ..." +cd /var/www/html/AVideo/Encoder/ && git pull && cd install && php install.php https://${SERVER_NAME} "${DB_MYSQL_USER}" "${DB_MYSQL_PASSWORD}" "${SYSTEM_ADMIN_PASSWORD}" "${DB_MYSQL_NAME}" "https://${SERVER_NAME}/Encoder" "${DB_MYSQL_HOST}" "${DB_MYSQL_PORT}" + echo "entrypoint -- Running reencodeAllVideos script..." cd /var/www/html/AVideo/Encoder/install && php reencodeAllVideos.php diff --git a/docker-compose.yml b/docker-compose.yml index 00f44e1d7add..ffddaec14ccf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: '3.9' services: avideo: diff --git a/env.example b/env.example index e370ed7ff169..d4445787f425 100644 --- a/env.example +++ b/env.example @@ -30,5 +30,5 @@ CONTACT_EMAIL=your_email@example.com MAIN_LANGUAGE=en SYSTEM_ADMIN_PASSWORD=password WEBSITE_TITLE=Your Website Title -TLS_CERTIFICATE_FILE=/path/to/your/certificate.crt -TLS_CERTIFICATE_KEY= +TLS_CERTIFICATE_FILE=/etc/apache2/ssl/localhost.crt +TLS_CERTIFICATE_KEY=/etc/apache2/ssl/localhost.key