forked from elmau/empresa-libre
Merge branch 'develop'
Cookies no seguras cuando no hay HTTPS
This commit is contained in:
commit
dcfc80edc8
|
@ -20,7 +20,7 @@ from controllers.main import (AppEmpresas,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
from settings import DEBUG, MV, PATH_SESSIONS
|
from settings import DEBUG, MV, NO_HTTPS, PATH_SESSIONS
|
||||||
|
|
||||||
|
|
||||||
db = StorageEngine()
|
db = StorageEngine()
|
||||||
|
@ -68,7 +68,8 @@ session_options = {
|
||||||
'session.data_dir': PATH_SESSIONS['data'],
|
'session.data_dir': PATH_SESSIONS['data'],
|
||||||
'session.lock_dir': PATH_SESSIONS['lock'],
|
'session.lock_dir': PATH_SESSIONS['lock'],
|
||||||
}
|
}
|
||||||
if DEBUG or MV:
|
# ~ Si no usas (NO deberías) certificados en tu servidor, ponla siempre en False
|
||||||
|
if DEBUG or MV or NO_HTTPS:
|
||||||
session_options['session.secure'] = False
|
session_options['session.secure'] = False
|
||||||
|
|
||||||
app = SessionMiddleware(api, session_options)
|
app = SessionMiddleware(api, session_options)
|
||||||
|
|
|
@ -12,7 +12,7 @@ from conf import DEBUG, MV, LOG_PATH
|
||||||
try:
|
try:
|
||||||
from conf import DEFAULT_PASSWORD
|
from conf import DEFAULT_PASSWORD
|
||||||
except ImportError:
|
except ImportError:
|
||||||
DEFAULT_PASSWORD = 'blades3.3'
|
DEFAULT_PASSWORD = 'salgueiro3.3'
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from conf import SEAFILE_SERVER
|
from conf import SEAFILE_SERVER
|
||||||
|
@ -24,9 +24,14 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
TITLE_APP = 'Empresa Libre'
|
TITLE_APP = 'Empresa Libre'
|
||||||
|
|
||||||
|
try:
|
||||||
|
from conf import NO_HTTPS
|
||||||
|
except ImportError:
|
||||||
|
NO_HTTPS = True
|
||||||
|
|
||||||
|
|
||||||
DEBUG = DEBUG
|
DEBUG = DEBUG
|
||||||
VERSION = '1.2.0'
|
VERSION = '1.5.0'
|
||||||
EMAIL_SUPPORT = ('soporte@empresalibre.net',)
|
EMAIL_SUPPORT = ('soporte@empresalibre.net',)
|
||||||
|
|
||||||
BASE_DIR = os.path.abspath(os.path.dirname(__file__))
|
BASE_DIR = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
Loading…
Reference in New Issue