Commit Graph

385 Commits

Author SHA1 Message Date
Karol Wypchlo 15aea1da40
Merge remote-tracking branch 'origin/master' into account-only-portals 2022-01-12 13:44:36 +01:00
Karol Wypchlo c04fd5067d
introduce portals for authenticated users only 2022-01-11 17:07:57 +01:00
Karol Wypchło a7bad7411a
Merge pull request #1497 from SkynetLabs/adjust-blocklist-airtable-script
do not prune nginx cache on airtable blocklist script
2022-01-11 16:38:07 +01:00
Karol Wypchlo b7a7d078ea
remove not exisiting dir copy after #1533 2022-01-11 12:56:29 +01:00
Karol Wypchło a86cb6e5b3
Merge pull request #1533 from SkynetLabs/get-rid-of-cache-purging-code
get rid of unused cache purgin code
2022-01-11 10:21:53 +01:00
Karol Wypchlo a73858e8e9
get rid of unused cache purgin code 2022-01-10 17:10:59 +01:00
Karol Wypchlo 6a889ad793
registry subscription endpoint 2022-01-10 14:51:16 +01:00
Karol Wypchło 31e80e129e
Merge pull request #1519 from SkynetLabs/use-portal-modules-to-discover-services
use portal modules env to discover services in nginx
2022-01-07 13:59:50 +01:00
Karol Wypchlo 31b7090863
change var name and add description 2022-01-07 13:36:04 +01:00
Karol Wypchlo d24c677a30
use portal modules env to discover services in nginx 2022-01-07 11:53:16 +01:00
Karol Wypchlo 669f700a9e
prevent files larger than 1GB from being stored in cache 2022-01-05 16:14:13 +01:00
Karol Wypchlo 5cf5acb4e2
do not prune blocklist manually 2021-12-23 13:17:07 +01:00
Karol Wypchlo 928e038749
fix skapp link redirect 2021-12-21 16:29:41 +01:00
Karol Wypchlo 51b56d2e42
fix skapp link redirect 2021-12-21 16:28:52 +01:00
Karol Wypchlo f456f1c850
remove /usr/local/bin /usr/bin /bin /usr/sbin /sbin /Applications/VMware Fusion.app/Contents/Public /usr/local/MacGPG2/bin /Library/Apple/usr/bin redirecting to 2021-12-21 16:17:40 +01:00
Karol Wypchlo 6b9e825966
expose /abuse and /abuse/report endpoints 2021-12-21 16:07:18 +01:00
Karol Wypchło 5b1d281ee1
Merge pull request #1479 from SkynetLabs/pj/abuse-skapp
Abuse Skapp: Update CORS rules
2021-12-21 15:56:13 +01:00
Karol Wypchło 76e302aa2a
Merge pull request #1478 from SkynetLabs/blake-hashing-lua
no delay blocklisting
2021-12-20 17:25:25 +01:00
Karol Wypchlo d34366aefc
improve get_stale usage docs 2021-12-20 16:55:14 +01:00
Karol Wypchlo 871712c3f8
improve docs around shared dict size 2021-12-20 16:50:54 +01:00
Karol Wypchlo 9805ac9b2a
limit local networks 2021-12-20 14:54:42 +01:00
Karol Wypchło a95a2627d8
Update docker/nginx/conf.d/server.local.conf
Co-authored-by: Ivaylo Novakov <ro-tex@users.noreply.github.com>
2021-12-20 14:18:48 +01:00
PJ b9feec9f1e
Merge branch 'master' of https://github.com/SkynetLabs/skynet-webportal into pj/mail-scanner 2021-12-20 13:46:36 +01:00
Karol Wypchlo 5673f44d1a
blocklist improvements 2021-12-20 13:12:56 +01:00
Ivaylo Novakov d09950f1e0
Fix the port of malware-scanner. 2021-12-20 12:52:17 +02:00
Karol Wypchlo b72c997e55
add proxy for stripe webhook endpoint 2021-12-19 16:53:50 +01:00
PJ a78d0cd98c
Use plain CORS 2021-12-17 16:00:01 +01:00
Ivaylo Novakov b37008b497
Merge pull request #1364 from SkynetLabs/sevey/update-default-limit
Update default limit for Uploads
2021-12-17 15:32:33 +01:00
PJ 91cd98eaa1
Add newline 2021-12-17 15:20:31 +01:00
PJ 98dc87ba6f
Update CORS rules 2021-12-17 15:15:06 +01:00
Karol Wypchlo a3711b1e0f
expose accounts /health endpoint 2021-12-15 12:44:01 +01:00
Ivaylo Novakov 412ba559fa
Expect 200s. 2021-12-14 14:38:40 +02:00
Ivaylo Novakov 60cef34bfc
Move blocker from .102 to .110 2021-12-14 11:10:15 +02:00
Ivaylo Novakov 95e8b85df9
Merge branch 'master' into ivo/clamav 2021-12-14 09:30:54 +02:00
PJ e4f7cf4101
Update maintainer 2021-12-13 15:45:22 +01:00
dependabot[bot] f25a2ce604
Bump node from 16.13.0-alpine to 16.13.1-alpine in /docker/handshake
Bumps node from 16.13.0-alpine to 16.13.1-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-13 14:39:06 +00:00
PJ 52e1ffbc0a
Add abuse scanner module 2021-12-13 10:42:46 +01:00
PJ d0da240ab9
Move script 2021-12-10 17:15:49 +01:00
Ivaylo Novakov bf5aa247dd
Add nginx triggers that would let malware-scanner know that it needs to scan a given skylink. 2021-12-09 16:21:49 +01:00
Ivaylo Novakov b3e7716a01
Merge branch 'master' into ivo/clamav 2021-12-09 14:32:13 +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 a4242a9234
Merge branch 'master' into accounts-api-refactor
# Conflicts:
#	.gitignore
2021-12-09 14:03:59 +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
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
PJ 341f313839
Remove comments 2021-12-02 17:28:40 +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 938c5905c5
Remove CORS settings 2021-12-02 17:07:11 +01:00
PJ c89663b393
Add missing semi colon 2021-12-02 14:05:41 +01:00