diff --git a/Dockerfile b/Dockerfile index 325fa8f..9adb906 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# docker-dotclear:x.x-anf +# docker-dotclear:* # docker-dotclear Dockerfile ## diff --git a/README.md b/README.md index f46e480..d5844f2 100644 --- a/README.md +++ b/README.md @@ -102,6 +102,7 @@ Blogs URLs looks like: * http://localhost/default/ * http://localhost/blog2/ * ... + Blogs administration is available at http://localhost/admin When you create a new blog in standard configuration, @@ -111,12 +112,14 @@ __Non standard configuration__ Setup nginx server configuration (see bellow): * adapt _/var/www/dotclear/servers/*.conf_ to your needs + Then to configure blog: * go to the administration interface at http://my_custom_domain/admin, * left side menu _Blog settings_ * panel _Advanced parameters_ * set _Blog URL_ to http://my_custom_domain/ (with trailing slash) * set _URL scan method_ to 'PATH_INFO' + Then fix public_path and public_url for the blog: * go to the administration interface at http://my_custom_domain/admin, * left side menu _about:config_ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index dec8df5..eecba2c 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -# docker-dotclear:x.x-anf +# docker-dotclear:* # Container starting script set -e diff --git a/etc/nginx.conf b/etc/nginx.conf index 830d8f7..c0d7c9e 100644 --- a/etc/nginx.conf +++ b/etc/nginx.conf @@ -1,3 +1,4 @@ +# docker-dotclear:* # /etc/nginx/nginx.conf # Nginx configuration diff --git a/etc/php-fpm.conf b/etc/php-fpm.conf index 9986348..ce9ac46 100644 --- a/etc/php-fpm.conf +++ b/etc/php-fpm.conf @@ -1,3 +1,4 @@ +; docker-dotclear:* ; /etc/phpXX/php-fpm.d/www.conf ; PHP-FPM configuration diff --git a/etc/snippets_blogs.conf b/etc/snippets_blogs.conf index 96248c0..5e01a7f 100644 --- a/etc/snippets_blogs.conf +++ b/etc/snippets_blogs.conf @@ -1,3 +1,4 @@ +# docker-dotclear:* # /etc/nginx/snippets/snippets_blogs.conf # Dotclear nginx default server blogs configurations diff --git a/etc/snippets_common.conf b/etc/snippets_common.conf index b736e73..6dd239f 100644 --- a/etc/snippets_common.conf +++ b/etc/snippets_common.conf @@ -1,3 +1,4 @@ +# docker-dotclear:* # /etc/nginx/snippets/snippets_commmon.conf # Dotclear nginx default server common configurations diff --git a/etc/stable-php.ini b/etc/stable-php.ini index 0a3597c..9e5e45f 100644 --- a/etc/stable-php.ini +++ b/etc/stable-php.ini @@ -1,3 +1,4 @@ +; docker-dotclear:latest ; /etc/phpXX/php.ini ; PHP configuration diff --git a/etc/unstable-php.ini b/etc/unstable-php.ini index 877ea77..88eec57 100644 --- a/etc/unstable-php.ini +++ b/etc/unstable-php.ini @@ -1,3 +1,4 @@ +; docker-dotclear:unstable ; /etc/phpXX/php.ini ; PHP configuration diff --git a/www/servers/default.conf b/www/servers/default.conf index f1f7e73..478a1a6 100644 --- a/www/servers/default.conf +++ b/www/servers/default.conf @@ -1,3 +1,4 @@ +# docker-dotclear:* # /var/www/dotclear/servers/default.conf # Default nginx server