The document root folder is now public

johncms · Dec 3, 2022 · 4bfa7b2 · 4bfa7b2
1 parent d7bef7b
commit 4bfa7b2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 /system/vendor
 /mix-manifest.json
 /docker/mariadb/data
+/public/build/*
 
 # Data folder ignores
 /data/debugbar/*

diff --git a/docker/general/nginx/conf.d/domains/default.conf b/docker/general/nginx/conf.d/domains/default.conf
@@ -3,7 +3,7 @@ server {
 
     # Make site accessible from http://localhost/
     server_name _;
-    root /var/www/html;
+    root /var/www/html/public;
 
     index index.php index.html index.htm;
 

diff --git a/.htaccess → public/.htaccess b/.htaccess → public/.htaccess
diff --git a/favicon.ico → public/favicon.ico b/favicon.ico → public/favicon.ico
diff --git a/index.php → public/index.php b/index.php → public/index.php
@@ -15,12 +15,12 @@
 use Johncms\Mail\EmailSender;
 
 // If the system is not installed, redirect to the installer.
-if (! is_file('config/autoload/database.local.php')) {
+if (! is_file('../config/autoload/database.local.php')) {
     header('Location: /install/');
     exit;
 }
 
-require 'system/bootstrap.php';
+require '../system/bootstrap.php';
 
 $container = ContainerFactory::getContainer();
 $application = new Application($container);

diff --git a/robots.txt → public/robots.txt b/robots.txt → public/robots.txt
diff --git a/vite.config.ts b/vite.config.ts
@@ -6,10 +6,11 @@ export default defineConfig({
   plugins: [
     vue()
   ],
-  base: '/public/',
+  publicDir: false,
+  base: '/build/',
   build: {
     manifest: true,
-    outDir: 'public/',
+    outDir: 'public/build/',
     rollupOptions: {
       input: {
         admin: './themes/admin/src/js/app.ts',