Merge pull request #1771 from jumpserver/dev

Dev

Merge pull request #1771 from jumpserver/dev
Dev
03adddef · 老广 · GitHub · 1194932b · 60b7ccdd · 03adddef
Unverified Commit 03adddef authored Sep 04, 2018 by 老广 Committed by GitHub Sep 04, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

settings.py apps/jumpserver/settings.py +4 -0

django.mo apps/locale/zh/LC_MESSAGES/django.mo +0 -0

django.po apps/locale/zh/LC_MESSAGES/django.po +0 -0

No files found.
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -355,6 +355,10 @@ AUTHENTICATION_BACKENDS = [
 # Custom User Auth model
 AUTH_USER_MODEL = 'users.User'
+# File Upload Permissions
+FILE_UPLOAD_PERMISSIONS = 0o644
+FILE_UPLOAD_DIRECTORY_PERMISSIONS = 0o755
 # Auth LDAP settings
 AUTH_LDAP = CONFIG.AUTH_LDAP
 AUTH_LDAP_SERVER_URI = CONFIG.AUTH_LDAP_SERVER_URI

--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po