diff --git a/.htaccess b/.htaccess deleted file mode 100644 index f96c3a6..0000000 --- a/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -#KONSOLEH AREA START - PLEASE DO NOT EDIT MANUALLY BETWEEN THESE LINES -DirectoryIndex index.php -#KONSOLEH AREA END - PLEASE ADD MANUAL CHANGES BELOW -SetEnv FLIXCOOKS_ADMIN_KEY "vFDH.N_tVLEKNdR3fhLs" \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2b55a59..32682a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && a2enmod rewrite headers \ && rm -rf /var/lib/apt/lists/* -# Apache: document root + AllowOverride for .htaccess +# Apache: document root, no per-directory overrides in production ENV APACHE_DOCUMENT_ROOT=/var/www/html RUN sed -ri 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \ && sed -ri 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \ && printf '%s\n' \ '' \ - ' AllowOverride All' \ + ' AllowOverride None' \ ' Require all granted' \ '' \ > /etc/apache2/conf-available/flixcooks.conf \ diff --git a/README.md b/README.md index 7f13002..da8a80d 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ http://localhost:8000 #### Option B: Local Apache (XAMPP / MAMP / WAMP) If you prefer running a full local stack: 1. Move or link the project directory inside your local server's document root (e.g., `htdocs` or `www`). -2. Ensure URL rewriting is enabled (the included `.htaccess` file handles caching and custom redirections). +2. Configure the virtual host to serve `index.php` as the directory index. 3. Access the site via your custom local virtual host (e.g., `http://localhost/flixcooks-website`). --- diff --git a/admin.php b/admin.php index 36ae186..85db7d0 100644 --- a/admin.php +++ b/admin.php @@ -2,9 +2,36 @@ session_start(); require __DIR__ . '/helpers.php'; -$ADMIN_KEY = getenv('FLIXCOOKS_ADMIN_KEY') ?: 'vFDH.N_tVLEKNdR3fhLs'; +$ADMIN_KEY = getenv('FLIXCOOKS_ADMIN_KEY') ?: ''; $authed = isset($_SESSION['fc_admin']) && $_SESSION['fc_admin'] === true; +if ($ADMIN_KEY === '') { + http_response_code(503); + ?> + + + + + + FlixCooks Admin Unavailable + + + + +
+

Admin unavailable

+

FLIXCOOKS_ADMIN_KEY is not configured.

+
+ + +