Commit Graph

6311 Commits

Author SHA1 Message Date
makram89
8e476f0c7d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/MUOR/configs/muor.conf
#	MUOR/MUOR/configs/muor_after_location_block.conf
#	MUOR/MUOR/configs/muor_before_location_block.conf
2022-01-30 18:24:22 +01:00
makram89
6d46a2a5de wsgi fix 2022-01-30 18:23:31 +01:00
prance
f8461d47a9 add timeout 2022-01-30 18:09:09 +01:00
prance
5c9b73492e remove uwsgi params 2022-01-30 18:06:23 +01:00
makram89
b6c99a4f02 path fix 2022-01-30 17:58:30 +01:00
prance
1727ac9e01 add domain to allowed hosts 2022-01-30 17:57:33 +01:00
prance
117222cafd change loading of loader page 2022-01-30 17:53:37 +01:00
makram89
e30255f504 try-fix 2022-01-30 17:18:02 +01:00
prance
dd7ef6f600 fix try_files in nginx conf 2022-01-30 17:12:48 +01:00
makram89
8bba3ad255 uwsgi-4 2022-01-30 17:10:25 +01:00
makram89
b100058ba3 uwsgi-3 2022-01-30 17:06:17 +01:00
makram89
003937d4cd Merge remote-tracking branch 'origin/master' 2022-01-30 17:03:22 +01:00
makram89
819139c42a uwsgi-2 2022-01-30 17:03:16 +01:00
prance
b4e184c4d7 Merge remote-tracking branch 'origin/master' 2022-01-30 16:45:39 +01:00
prance
d5162ce41b add loader page 2022-01-30 16:45:32 +01:00
makram89
3f25594788 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/requirements.txt
2022-01-30 16:43:11 +01:00
makram89
c39ad275ff uwsgi 2022-01-30 16:42:28 +01:00
prance
7f10c50614 change loader from template to static html 2022-01-30 16:37:06 +01:00
prance
14288de087 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/MUOR/settings.py
2022-01-30 16:33:05 +01:00
prance
14a2e7d185 add celery with task clearing task 2022-01-30 16:32:09 +01:00
makram89
6c078fda8b settings correction 2022-01-30 15:40:05 +01:00
makram89
5243b24a5a docekr image in settings 2022-01-30 15:36:34 +01:00
makram89
5ab91ec250 Merge remote-tracking branch 'origin/master' 2022-01-30 15:30:46 +01:00
makram89
1c67dc4ae3 uwsgi.ini 2022-01-30 15:30:37 +01:00
5416298d8a Merge pull request 'add loader view' (#5) from RANDOMSEC-32 into master
Reviewed-on: #5
2022-01-30 15:27:37 +01:00
af8b9aa131 add loader view 2022-01-30 15:25:45 +01:00
prance
0d5201a575 add loading text 2022-01-30 15:12:38 +01:00
prance
455593c933 add 403 reload 2022-01-30 15:09:25 +01:00
prance
143282b656 add 403 reload 2022-01-30 15:09:07 +01:00
prance
dcf932b66d add initial configurations 2022-01-30 14:54:51 +01:00
prance
46f8195ed9 dedup ciphers 2022-01-29 19:49:48 +01:00
prance
8befe60e46 add ssl to crsf trusted origins 2022-01-29 19:43:14 +01:00
prance
1a1588ee79 add ssl 2022-01-29 19:23:36 +01:00
prance
277513d814 change reload command 2022-01-28 01:50:29 +01:00
prance
da2e76cc88 change address 2022-01-28 01:49:19 +01:00
prance
b02e5bbb38 imporve nginx configs 2022-01-28 01:28:46 +01:00
prance
840fb66840 literówka XD 2022-01-28 00:42:53 +01:00
prance
d55ac7c5d1 change config files 2022-01-28 00:41:41 +01:00
makram89
5bb0a56053 port_fixes 2022-01-28 00:41:18 +01:00
prance
2a3c514e4c add NGINXConf runs 2022-01-28 00:27:12 +01:00
prance
948444bdb9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/MUOR/signals.py
2022-01-28 00:15:29 +01:00
prance
8773236047 change method of session key retrival 2022-01-28 00:14:14 +01:00
makram89
a33dc0dee0 ports fix 2022-01-28 00:13:08 +01:00
makram89
e1441af9a3 docker - kinda works 2022-01-28 00:00:44 +01:00
makram89
e8b9824873 apps 2022-01-27 23:51:56 +01:00
makram89
7a858d2199 Merge remote-tracking branch 'origin/master' 2022-01-27 23:30:17 +01:00
makram89
1ca8118142 decorator container logg_off 2022-01-27 23:30:11 +01:00
prance
f02e4cd8a3 change home view 2022-01-27 23:23:22 +01:00
makram89
341339ca8b decorator container start-up 2022-01-27 23:18:02 +01:00
prance
f87290b6b5 change foregin key to one to one field and add MUOR app to settings. 2022-01-27 22:49:57 +01:00