move /media to /storage/uploads. Closes directus#1197

softdzx · Jul 20, 2016 · 441fbd2 · 441fbd2
1 parent c0f0f1f
commit 441fbd2
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 152 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,10 +39,8 @@ customs/ui/*
 !customs/ui/.gitignore
 /customs/listviews/*
 !customs/listviews/.gitignore
-!media/.gitignore
-!media/thumbs/.gitignore
-media_auth_proxy/client_auth_proxies/*
-!media_auth_proxy/client_auth_proxies/.gitignore
+!storage/uploads/.gitignore
+!storage/uploads/thumbs/.gitignore
 
 utils
 seperator

diff --git a/api/configuration_sample.php b/api/configuration_sample.php
@@ -13,12 +13,12 @@
     // To shift a outsite the Directus root directory use this instead
     // 'root' => realpath(BASE_PATH.'/../media'),
     // Note: BASE_PATH constant does not end with a trailing slash
-    'root' => BASE_PATH . '/media',
+    'root' => BASE_PATH . '/storage/uploads',
     // This is the url where all files/media will be pointing to
     // All orignial files will exist at your-domain.com/media
-    'root_url' => '/media',
+    'root_url' => '/storage/uploads',
     // All thumbnails will exist at your-domain.com/media/thumbs
-    'root_thumb_url' => '/media/thumbs',
+    'root_thumb_url' => '/storage/uploads/thumbs',
     //   'key'    => 's3-key',
     //   'secret' => 's3-key',
     //   'region' => 's3-region',

diff --git a/api/core/Directus/Util/Installation/stubs/configuration.stub b/api/core/Directus/Util/Installation/stubs/configuration.stub
@@ -19,14 +19,14 @@ return array(
         // By default media directory are located at the same level of directus root
         // To make them a level up outsite the root directory
         // use this instead
-        // Ex: 'root' => realpath(BASE_PATH.'/../media'),
+        // Ex: 'root' => realpath(BASE_PATH.'/../storage/uploads'),
         // Note: BASE_PATH constant doesn't end with trailing slash
-        'root' => BASE_PATH . '/media',
+        'root' => BASE_PATH . '/storage/uploads',
         // This is the url where all the media will be pointing to
-        // here all assets will be (yourdomain)/media
-        // same with thumbnails (yourdomain)/media/thumbs
-        'root_url' => '{{directus_path}}media',
-        'root_thumb_url' => '{{directus_path}}media/thumbs',
+        // here all assets will be (yourdomain)/storage/uploads
+        // same with thumbnails (yourdomain)/storage/uploads/thumbs
+        'root_url' => '{{directus_path}}storage/uploads',
+        'root_thumb_url' => '{{directus_path}}storage/uploads/thumbs',
         //   'key'    => 's3-key',
         //   'secret' => 's3-key',
         //   'region' => 's3-region',

diff --git a/media_auth_proxy/client_auth_proxies/.gitignore b/media_auth_proxy/client_auth_proxies/.gitignore
diff --git a/media_auth_proxy/index.php b/media_auth_proxy/index.php
diff --git a/media/.gitignore → storage/uploads/.gitignore b/media/.gitignore → storage/uploads/.gitignore
diff --git a/media/.htaccess → storage/uploads/.htaccess b/media/.htaccess → storage/uploads/.htaccess
diff --git a/media/thumbs/.gitignore → storage/uploads/thumbs/.gitignore b/media/thumbs/.gitignore → storage/uploads/thumbs/.gitignore
diff --git a/tests/api/Util/Installation/mock/configuration.sample.php b/tests/api/Util/Installation/mock/configuration.sample.php
@@ -19,14 +19,14 @@
         // By default media directory are located at the same level of directus root
         // To make them a level up outsite the root directory
         // use this instead
-        // Ex: 'root' => realpath(BASE_PATH.'/../media'),
+        // Ex: 'root' => realpath(BASE_PATH.'/../storage/uploads'),
         // Note: BASE_PATH constant doesn't end with trailing slash
-        'root' => BASE_PATH . '/media',
+        'root' => BASE_PATH . '/storage/uploads',
         // This is the url where all the media will be pointing to
-        // here all assets will be (yourdomain)/media
-        // same with thumbnails (yourdomain)/media/thumbs
-        'root_url' => '/directus/media',
-        'root_thumb_url' => '/directus/media/thumbs',
+        // here all assets will be (yourdomain)/storage/uploads
+        // same with thumbnails (yourdomain)/storage/uploads/thumbs
+        'root_url' => '/directus/storage/uploads',
+        'root_thumb_url' => '/directus/storage/uploads/thumbs',
         //   'key'    => 's3-key',
         //   'secret' => 's3-key',
         //   'region' => 's3-region',