mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 19:17:13 -05:00 
			
		
		
		
	Merge branch 'variable-media' into develop
This commit is contained in:
		
						commit
						6e49995c0c
					
				@ -85,3 +85,5 @@ PAPERLESS_SHARED_SECRET=""
 | 
				
			|||||||
# the default location
 | 
					# the default location
 | 
				
			||||||
#PAPERLESS_DBDIR=/path/to/database/file
 | 
					#PAPERLESS_DBDIR=/path/to/database/file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Override the default MEDIA_ROOT here.  This is where all files are stored.
 | 
				
			||||||
 | 
					#PAPERLESS_MEDIADIR=/path/to/media
 | 
				
			||||||
 | 
				
			|||||||
@ -151,7 +151,10 @@ USE_TZ = True
 | 
				
			|||||||
# https://docs.djangoproject.com/en/1.9/howto/static-files/
 | 
					# https://docs.djangoproject.com/en/1.9/howto/static-files/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
STATIC_ROOT = os.path.join(BASE_DIR, "..", "static")
 | 
					STATIC_ROOT = os.path.join(BASE_DIR, "..", "static")
 | 
				
			||||||
MEDIA_ROOT = os.path.join(BASE_DIR, "..", "media")
 | 
					MEDIA_ROOT = os.getenv(
 | 
				
			||||||
 | 
					                "PAPERLESS_MEDIADIR",
 | 
				
			||||||
 | 
					                os.path.join(BASE_DIR, "..", "media")
 | 
				
			||||||
 | 
					             )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
STATIC_URL = '/static/'
 | 
					STATIC_URL = '/static/'
 | 
				
			||||||
MEDIA_URL = "/media/"
 | 
					MEDIA_URL = "/media/"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user