Commit Graph

3077 Commits

Author SHA1 Message Date
Ivaylo Novakov b3e7716a01
Merge branch 'master' into ivo/clamav 2021-12-09 14:32:13 +01:00
Ivaylo Novakov 5b4105df45
Merge pull request #1377 from SkynetLabs/accounts-api-refactor
upgrade accounts to new api (autologin)
2021-12-09 14:30:29 +01:00
Ivaylo Novakov 39c4790364 Weekly Deploy for Dec 6, 2021. Including cache pruning fix
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEl73IdNcm91gzFlRkmt3TRPEwV/YFAmGuXlsACgkQmt3TRPEw
 V/b+dA//THc5/LWTRs8r7BAOQj8V9QzxJsuS7g+gV4zeDW5ymXlK0lSRSXvjNsOW
 mQ21Qx5fE05ztRlUNOUPKd1bZUgnL4O5AUBWUm87rq6NXHVop1JYaFGOpbfUpRZT
 HWE2SwGgwBRUjSgkwkz+jsg8SkajADwThLf8aSNAmKWienondtEFA8hMtBqUcyjK
 A7AsQbjjjS62lUsP78SJEPM5pG0vX+FxHzMAUtkqT94foJlI4RosyAp3yDPjrR/8
 eUn/CCci9p/ORzKnKos9DAo+1G5X0qgrP/9aGlnpDlkYZ2SQfJVMAKWaMpfIUsWi
 zihJYPogFAUHaDY1ddEnx47aYRN7hmumDGM+iUvbi39LshPBdBaeW56RRyA3qBel
 pD5eXr53C6kje5Wu6t9SbzILjh5cuQ8vd50hnrJ282vSMZbwqwwKjpliZu4FsrQC
 OiA1K7l7P8gAiL8d5YQOJ2uBTviAA0A8wNVPHx8qd/hWNOr7WxSM75POyTvRNtRq
 GdZko6/FDrK48Gw8LNxZMUa7x5LfjgtyiWfGsYomRG3GLBcy44neEhk3P37sELJv
 /jr0aOhLW+95r3OI7sUqnMppWdCKa5XFEqxTHc5Zax+NKzao3aSvRDNtujKxe+IC
 NfzJVXLtsde/Bho1B1q7GSG3YTINcJ422YwDNWfbCV0qajW40GU=
 =JEZB
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEWWr7bKPf/zmGZCrIBrk1SrCL6cYFAmGyAhsACgkQBrk1SrCL
 6ca/cwf/eXbHwojF27fYPoziWWskatsdCKJ2jnu1ovqVceVYztX9Kt+CQ++Ri4A9
 LqKvDPwLfKXF0W3x/nK6FtL2CSq81SPED/mLKMH/XTsbwtsnPFbnAzxdl7tqSA2Y
 6mqyBnyeyGby6tGW2ZE5EAYRv/dkKYzlTp7WMqoalleoRy6sbS6RZ8bJMA8xrbPo
 RwIAfvl4MVItt/qpws+J9g/qQ2QR8ZZKZtDxLxGNSFw9GDQBk/hKxRI9nP1WEsVp
 SEHCmfveOAdbzf8Cbr4j/m6wmoXPr+2qF5QIJ8eDiEAQ2YLPKbMpk6xO500geAFl
 k+6BHOQR2dOfsyyo33IFIcV9NyvDAQ==
 =F885
 -----END PGP SIGNATURE-----

Merge tag 'deploy-2021-12-06' into ivo/clamav

Weekly Deploy for Dec 6, 2021. Including cache pruning fix

# gpg: Signature made Mon Dec  6 20:02:51 2021 CET
# gpg:                using RSA key 97BDC874D726F758331654649ADDD344F13057F6
# gpg: key 9ADDD344F13057F6: public key "Matthew Sevey (Created on MacOS Big Sur for Yubi Key Nano 5) <mjsevey@gmail.com>" imported
# gpg: Total number processed: 1
# gpg:               imported: 1
# gpg: Good signature from "Matthew Sevey (Created on MacOS Big Sur for Yubi Key Nano 5) <mjsevey@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 97BD C874 D726 F758 3316  5464 9ADD D344 F130 57F6
2021-12-09 14:18:19 +01:00
Ivaylo Novakov c79f65061f
Switch to `main`. 2021-12-09 14:16:21 +01:00
Ivaylo Novakov a4242a9234
Merge branch 'master' into accounts-api-refactor
# Conflicts:
#	.gitignore
2021-12-09 14:03:59 +01:00
Ivaylo Novakov d0ce8b9a2c
Keep cockroach running for the moment. 2021-12-08 17:39:22 +01:00
Ivaylo Novakov 95c11deb22
Revert "Keep cockroach running for the moment."
This reverts commit ed83468a03.
2021-12-08 17:39:02 +01:00
Ivaylo Novakov ed83468a03
Keep cockroach running for the moment. 2021-12-08 17:38:09 +01:00
Matthew Sevey a50ea4e312
Merge branch 'master' into portal-latest 2021-12-06 14:02:19 -05:00
Ivaylo Novakov fd26441077
Merge pull request #1428 from SkynetLabs/sevey/mute-more-pings
Mute check failures unless server is down
2021-12-06 19:37:06 +01:00
Matthew Sevey 9fe0628fe7
Mute check failures unless server is down 2021-12-06 13:28:30 -05:00
Matthew Sevey 82d258008f
Merge pull request #1427 from SkynetLabs/fil/nginx-prune
Add pruning Nginx cache
2021-12-06 10:55:14 -05:00
Filip Rysavy 1c1f3c6ec1
Fix condition mistake 2021-12-06 16:13:00 +01:00
Filip Rysavy aca71c245e
Add comments to nginx pruning script 2021-12-06 14:13:56 +01:00
Filip Rysavy 0af14d32db
Add pruning Nginx cache 2021-12-06 13:35:17 +01:00
Matthew Sevey 7bf366db24
Add serverload endpoint (#1410)
* write usage script for cpu and free disk space tracking, testing new endpoint

* Test alias nginx path

* testing json

* fix server load json file being served by nginx

* Fix filenames

* Add changelog

* Add systemd file for serverload

* Update setup-scripts/serverload.sh

Co-authored-by: Peter-Jan Brone <peter-jan@settlemint.com>
2021-12-06 12:49:58 +01:00
Ivaylo Novakov 52dd4f7cf1
Remove debug output. 2021-12-03 15:51:33 +01:00
Ivaylo Novakov 1401f2b9e1
Add a test change. 2021-12-03 15:00:20 +01:00
Chris Schinnerl 489f1ece99
fix mount 2021-12-03 12:42:39 +01:00
Chris Schinnerl 09a5e4af77
/api 2021-12-03 11:05:35 +01:00
Chris Schinnerl 5b3735927a
fix unpin 2021-12-03 10:36:16 +01:00
Chris Schinnerl 495dd8d14b
Merge remote-tracking branch 'origin/master' into accounts-api-refactor 2021-12-03 10:20:33 +01:00
Christopher Schinnerl b2dbe4bdb4
Merge pull request #1408 from SkynetLabs/pj/abuse
Abuse Reports
2021-12-02 19:12:28 +01:00
Ivaylo Novakov 3bef37b789
Revert the change of JWKS path 2021-12-02 18:04:19 +01:00
Ivaylo Novakov 1351fb79d2
New path to JWKS.json. 2021-12-02 17:34:22 +01:00
PJ 341f313839
Remove comments 2021-12-02 17:28:40 +01:00
PJ 4d936a05c2
Add changelog 2021-12-02 17:26:22 +01:00
PJ 6e1af409c6
Remove commented out code 2021-12-02 17:23:37 +01:00
PJ 7f28d30a44
Update branch arg 2021-12-02 17:20:14 +01:00
PJ 0f96e3822d
Merge branch 'pj/abuse' of https://github.com/SkynetLabs/skynet-webportal into pj/abuse 2021-12-02 17:07:23 +01:00
PJ 938c5905c5
Remove CORS settings 2021-12-02 17:07:11 +01:00
Ivaylo Novakov 31d73821ef
Add a volume to accounts, so it can find its JWKS.json 2021-12-02 14:14:28 +01:00
PJ c89663b393
Add missing semi colon 2021-12-02 14:05:41 +01:00
Matthew Sevey e95f0e2c9c
Merge branch 'master' into portal-latest 2021-12-01 15:22:03 -05:00
Matthew Sevey acca9ee32d
Merge pull request #1391 from SkynetLabs/sevey/disabl-load-check
Disable load check until we have a process of actively addressing it
2021-12-01 15:20:12 -05:00
Matthew Sevey c45b9c41bd
format 2021-12-01 14:16:46 -05:00
Matthew Sevey 3e17c1a9ee
remove ping instead of disable 2021-12-01 12:07:15 -05:00
Matthew Sevey 3d11ca503f
Merge branch 'master' into sevey/disabl-load-check 2021-12-01 12:06:08 -05:00
PJ 6c99803749
Bypass CORS issue 2021-12-01 16:51:40 +01:00
PJ 25fd697d5f
Configure routes 2021-12-01 16:23:56 +01:00
firyx 330280e0ac
Merge pull request #1406 from SkynetLabs/pj/nginx-min-free
Nginx min_free
2021-12-01 15:52:23 +01:00
Filip Rysavy bb0230fa6b
Merge branch 'master' into portal-latest 2021-12-01 15:34:25 +01:00
Christopher Schinnerl 6dec2be02a
Merge pull request #1407 from SkynetLabs/fil/health-checker-disk-space-dump
Dump disk usage on health-checker critical disk space
2021-12-01 15:29:35 +01:00
Filip Rysavy ec3a26e8b5
Fix script permissions 2021-12-01 13:49:02 +01:00
Filip Rysavy 5ae447f9b2
Dump disk usage on health-checker critical disk space 2021-12-01 13:27:33 +01:00
PJ 63b283fc42
Update block routes 2021-12-01 12:56:25 +01:00
PJ 0f740419f3
Remove branch arg 2021-12-01 11:19:06 +01:00
PJ 1fe2c3d76f
Add abuse location 2021-12-01 11:18:25 +01:00
PJ a03860419f
Update dockerfile 2021-12-01 11:04:02 +01:00
PJ fe87f19e68
Update dc to include blocker module 2021-12-01 11:02:55 +01:00