Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Install redirect fix for nginx when running on different port. Added commented docker code for auto install.

givanz44a0881b581a
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6bf8233..d23e9f8 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -26,6 +26,23 @@ services:
networks:
- internal
+ # uncomment lines bellow for auto install
+ #vvveb-install:
+ #build:
+ #context: .
+ #volumes:
+ #- ./:/var/www/html/
+ #entrypoint:
+ #[
+ #"bash",
+ #"-c",
+ #"sleep 5 && php cli.php install module=index host=db user=vvveb password=vvveb database=vvveb admin[email][email protected] admin[password]=admin",
+ #]
+ #depends_on:
+ #- php
+ #networks:
+ #- internal
+
nginx:
image: nginx:alpine
ports:
diff --git a/index.php b/index.php
index 298ccc1..e624cc7 100755
--- a/index.php
+++ b/index.php
@@ -39,8 +39,7 @@ function is_installed() {
return file_exists(DIR_ROOT . 'config' . DS . 'db.php');
}
-$protocol = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-$installPathRedirect = "{$protocol}://{$_SERVER['HTTP_HOST']}/install";
+$installPathRedirect = '/install/index.php';
if (! defined('APP')) {
if (is_installed()) {
@@ -53,8 +52,8 @@ if (! defined('APP')) {
die(header("Location: $installPathRedirect"));
}
}
-} elseif (! is_installed() && APP != 'install') {
- define('APP', 'install');
+} elseif (! is_installed() && (!defined('APP') || APP != 'install')) {
+ defined('APP') || define('APP', 'install');
if (isset($_SERVER['REQUEST_URI']) && strpos($_SERVER['REQUEST_URI'], 'install') === false) {
die(header("Location: $installPathRedirect"));