Compare commits

...
This repository has been archived on 2022-10-07. You can view files and clone it, but cannot push or open issues or pull requests.

202 Commits

Author SHA1 Message Date
Karol Wypchło 3da3cf949f
Merge pull request #2255 from SkynetLabs/renovate/skynetlabs-webportal-health-check-1.x
chore(deps): update skynetlabs/webportal-health-check docker tag to v1
2022-10-06 01:47:34 +02:00
renovate[bot] 15d5d7c0d7
chore(deps): update skynetlabs/webportal-health-check docker tag to v1 2022-10-05 23:46:59 +00:00
Karol Wypchło 9559ec160c
Merge pull request #2254 from SkynetLabs/renovate/skynetlabs-webportal-health-check-0.x
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.5.4
2022-10-05 21:07:44 +02:00
renovate[bot] f21f718c13
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.5.4 2022-10-05 19:04:22 +00:00
Karol Wypchło f1ac4c5653
Merge pull request #2252 from SkynetLabs/renovate/certbot-dns-route53-1.x
chore(deps): update certbot/dns-route53 docker tag to v1.31.0
2022-10-05 09:56:53 +02:00
Karol Wypchło 17ea999288
Merge pull request #2253 from SkynetLabs/renovate/jaegertracing
chore(deps): update jaegertracing to v1.38.1
2022-10-05 09:56:13 +02:00
renovate[bot] f91cb72db7
chore(deps): update jaegertracing to v1.38.1 2022-10-05 01:35:25 +00:00
renovate[bot] f83f3cefe8
chore(deps): update certbot/dns-route53 docker tag to v1.31.0 2022-10-04 17:18:21 +00:00
Karol Wypchło e63fcbecb7
Merge pull request #2251 from SkynetLabs/renovate/mongo-4.x
chore(deps): update mongo docker tag to v4.4.17
2022-09-30 10:37:37 +02:00
Karol Wypchło 5ff2f5891e
Merge pull request #2250 from SkynetLabs/delete-skylink-dumps-older-than-week
delete skylink dumps older than week
2022-09-30 10:29:44 +02:00
renovate[bot] b7afcd1feb
chore(deps): update mongo docker tag to v4.4.17 2022-09-29 23:10:43 +00:00
Karol Wypchlo ba106d69f2
delete skylink dumps older than week 2022-09-29 19:48:59 +02:00
Karol Wypchło 8ce5c9d7e6
Merge pull request #2246 from SkynetLabs/amend-skyd-logrotate-and-add-pinner
Amend skyd logrotate and add pinner
2022-09-27 13:18:14 +02:00
Karol Wypchlo b2313c602a
new pinner logrotate config 2022-09-26 11:30:24 +02:00
Karol Wypchlo 2ea337a3b0
change skyd logrotate to copytruncate 2022-09-26 11:30:13 +02:00
Karol Wypchło 919d22b314
Merge pull request #2245 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.8
2022-09-23 14:30:13 +02:00
renovate[bot] 983602e5aa
chore(deps): update skynetlabs/pinner docker tag to v0.7.8 2022-09-23 12:26:22 +00:00
Karol Wypchło bb8485b1cc
Merge pull request #2244 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.7
2022-09-22 15:25:33 +02:00
renovate[bot] 91e8fad3b1
chore(deps): update skynetlabs/pinner docker tag to v0.7.7 2022-09-22 13:23:36 +00:00
Karol Wypchło 74b72f4f47
add skynet-webportal-skyd logrotate config 2022-09-22 12:33:47 +02:00
Karol Wypchło a940f2728f
add skynet-webportal-nginx logrotate config 2022-09-22 12:33:16 +02:00
Karol Wypchło 634c623e48
Merge pull request #2243 from SkynetLabs/revert-2237-logrotated
Revert "logrotate.d configuration"
2022-09-22 12:18:27 +02:00
Karol Wypchło d926c22aa4
Revert "logrotate.d configuration" 2022-09-22 12:13:09 +02:00
Karol Wypchło 9958b66faf
Merge pull request #2236 from SkynetLabs/remove-deploy-configuration
remove deploy configuration
2022-09-21 14:03:15 +02:00
Karol Wypchło 8381555ce7
Merge pull request #2237 from SkynetLabs/logrotated
logrotate.d configuration
2022-09-21 14:02:16 +02:00
Karol Wypchło 94860262a5
Merge pull request #2240 from SkynetLabs/renovate/skynetlabs-webportal-handshake-api-0.x
chore(deps): update skynetlabs/webportal-handshake-api docker tag to v0.1.3
2022-09-21 14:00:56 +02:00
Karol Wypchło c4243968e1
Merge pull request #2238 from SkynetLabs/revert-1428-sevey/mute-more-pings
Revert "Mute check failures unless server is down"
2022-09-21 14:00:47 +02:00
Karol Wypchło c49cb57315
Merge pull request #2239 from SkynetLabs/renovate/skynetlabs-webportal-dnslink-api-0.x
chore(deps): update skynetlabs/webportal-dnslink-api docker tag to v0.2.1
2022-09-21 14:00:39 +02:00
Karol Wypchło 1334537729
Merge pull request #2241 from SkynetLabs/renovate/skynetlabs-webportal-health-check-0.x
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.5.1
2022-09-21 14:00:24 +02:00
Karol Wypchło 823efb2238
Merge pull request #2242 from SkynetLabs/renovate/skynetlabs-webportal-website-0.x
chore(deps): update skynetlabs/webportal-website docker tag to v0.2.3
2022-09-21 13:59:43 +02:00
renovate[bot] b3c300d7bf
chore(deps): update skynetlabs/webportal-website docker tag to v0.2.3 2022-09-21 11:51:34 +00:00
renovate[bot] 89a263bfc6
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.5.1 2022-09-21 11:51:30 +00:00
renovate[bot] d5cc81f934
chore(deps): update skynetlabs/webportal-handshake-api docker tag to v0.1.3 2022-09-21 11:51:25 +00:00
renovate[bot] 1f0d66a33a
chore(deps): update skynetlabs/webportal-dnslink-api docker tag to v0.2.1 2022-09-21 11:51:20 +00:00
Karol Wypchło 686e20b8a3
use best gzip compression 2022-09-21 13:22:04 +02:00
Karol Wypchło 70b80bb072
use best gzip compression 2022-09-21 13:21:50 +02:00
Karol Wypchło 167a56383f
use best gzip compression 2022-09-21 13:21:27 +02:00
Karol Wypchło c054ffb0ea
Revert "Mute check failures unless server is down" 2022-09-20 15:18:34 +02:00
Karol Wypchlo 17e4d782ca
no need to logrotate 3 levels deep 2022-09-20 14:46:03 +02:00
Karol Wypchlo 4b52d3c671
logrotate.d 2022-09-20 13:51:40 +02:00
Karol Wypchlo c85d788939
remove deploy configuration 2022-09-19 15:16:57 +02:00
Karol Wypchło e4cd4bf991
Merge pull request #2235 from SkynetLabs/renovate/jaegertracing
chore(deps): update jaegertracing to v1.38.0
2022-09-19 12:49:24 +02:00
renovate[bot] 263b733480
chore(deps): update jaegertracing to v1.38.0 2022-09-16 15:26:08 +00:00
Ivaylo Novakov 7ddec93e59
Merge pull request #2232 from SkynetLabs/remove-outdated-readme-info
remove outdated readme info
2022-09-14 14:12:11 +02:00
Christopher Schinnerl ac7942640f
Merge pull request #2231 from SkynetLabs/cleanup-setup-scripts
remove outdated scripts
2022-09-14 14:08:13 +02:00
Christopher Schinnerl 46f8ef0836
Merge branch 'master' into remove-outdated-readme-info 2022-09-14 14:05:46 +02:00
Karol Wypchlo 63323685cc
bring back up and down scripts 2022-09-14 11:29:46 +02:00
Ivaylo Novakov e281e9ca78
Merge branch 'master' into cleanup-setup-scripts 2022-09-14 11:07:12 +02:00
Karol Wypchlo d753be9383
remove more unused scripts 2022-09-13 17:12:45 +02:00
Karol Wypchło bcb0c0cf24
Merge pull request #2233 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.6
2022-09-13 16:18:44 +02:00
Karol Wypchło 47046ab31e
Merge pull request #2234 from SkynetLabs/renovate/skynetlabs-skyd-1.x
chore(deps): update skynetlabs/skyd docker tag to v1.6.9
2022-09-13 16:18:28 +02:00
renovate[bot] be8359791e
chore(deps): update skynetlabs/skyd docker tag to v1.6.9 2022-09-13 14:06:35 +00:00
renovate[bot] 4689844014
chore(deps): update skynetlabs/pinner docker tag to v0.7.6 2022-09-13 14:06:30 +00:00
Karol Wypchło 1d1096fd3b
remove outdated readme info 2022-09-13 13:45:49 +02:00
Karol Wypchlo 08c21cafe4
remove outdated setup scripts 2022-09-13 13:39:00 +02:00
Ivaylo Novakov 378ce234dc
Merge pull request #2230 from SkynetLabs/renovate/skynetlabs-webportal-accounts-dashboard-2.x
chore(deps): update skynetlabs/webportal-accounts-dashboard docker tag to v2.1.1
2022-09-13 13:02:14 +02:00
renovate[bot] 3f66dd30dd
chore(deps): update skynetlabs/webportal-accounts-dashboard docker tag to v2.1.1 2022-09-13 10:44:12 +00:00
Karol Wypchło 1c3bcbc063
Update authorized_keys 2022-09-13 12:08:01 +02:00
Ivaylo Novakov 4ccbd351f5
Merge pull request #2229 from SkynetLabs/renovate/skynetlabs-webportal-nginx-1.x
chore(deps): update skynetlabs/webportal-nginx docker tag to v1
2022-09-13 11:13:28 +02:00
Ivaylo Novakov 00a1481091
Merge branch 'master' into renovate/skynetlabs-webportal-nginx-1.x 2022-09-13 11:12:58 +02:00
Ivaylo Novakov e566dad718
Merge pull request #2228 from SkynetLabs/renovate/skynetlabs-webportal-dnslink-api-0.x
chore(deps): update skynetlabs/webportal-dnslink-api docker tag to v0.2.0
2022-09-13 11:12:45 +02:00
renovate[bot] 2ec8b1bdec
chore(deps): update skynetlabs/webportal-nginx docker tag to v1 2022-09-12 10:23:43 +00:00
renovate[bot] 72e7de53db
chore(deps): update skynetlabs/webportal-dnslink-api docker tag to v0.2.0 2022-09-12 10:23:38 +00:00
Ivaylo Novakov cb81ff738b
Merge pull request #2178 from SkynetLabs/pj/abuse-scanner-updates
Update abuse-scanner compose file
2022-09-08 11:11:53 +02:00
Ivaylo Novakov 9477ae03a5
Merge pull request #2227 from SkynetLabs/renovate/certbot-dns-route53-1.x
chore(deps): update certbot/dns-route53 docker tag to v1.30.0
2022-09-08 11:10:54 +02:00
renovate[bot] 88bd55fe64
chore(deps): update certbot/dns-route53 docker tag to v1.30.0 2022-09-07 20:33:02 +00:00
PJ 2de3d03cd0
Bump image tag 2022-09-01 14:58:21 +02:00
PJ 47175686db
Update docker-compose file 2022-09-01 12:54:03 +02:00
Christopher Schinnerl b510f2e5c3
Merge pull request #2225 from SkynetLabs/renovate/skynetlabs-skyd-1.x
chore(deps): update skynetlabs/skyd docker tag to v1.6.8
2022-08-30 17:42:54 +02:00
renovate[bot] be3db7aa0f
chore(deps): update skynetlabs/skyd docker tag to v1.6.8 2022-08-30 15:41:47 +00:00
Christopher Schinnerl fd1dfb2185
Merge pull request #2224 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.5
2022-08-30 14:34:19 +02:00
renovate[bot] 7e0f429ec4
chore(deps): update skynetlabs/pinner docker tag to v0.7.5 2022-08-30 12:05:23 +00:00
Christopher Schinnerl 61cd003013
Merge pull request #2223 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.4
2022-08-25 17:31:58 +02:00
renovate[bot] 9d728b1855
chore(deps): update skynetlabs/pinner docker tag to v0.7.4 2022-08-25 15:18:37 +00:00
Karol Wypchło 681d0d95bc
Merge pull request #2222 from SkynetLabs/renovate/skynetlabs-webportal-website-0.x
chore(deps): update skynetlabs/webportal-website docker tag to v0.2.2
2022-08-25 16:50:36 +02:00
renovate[bot] 739b96cd5a
chore(deps): update skynetlabs/webportal-website docker tag to v0.2.2 2022-08-25 14:47:45 +00:00
Ivaylo Novakov e629e7bc7f
Merge pull request #2214 from SkynetLabs/ivo/jaeger_clean
Use Jaeger's own cleanup container
2022-08-25 13:37:22 +02:00
Karol Wypchło 7d33fbd93f
Merge pull request #2220 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.3
2022-08-25 13:35:45 +02:00
renovate[bot] 500fb3bfd7
chore(deps): update skynetlabs/pinner docker tag to v0.7.3 2022-08-25 11:35:12 +00:00
Karol Wypchło fd53ef99c1
Merge pull request #2219 from SkynetLabs/renovate/skynetlabs-skyd-1.x
chore(deps): update skynetlabs/skyd docker tag to v1.6.7
2022-08-25 10:43:00 +02:00
renovate[bot] 9964e276fc
chore(deps): update skynetlabs/skyd docker tag to v1.6.7 2022-08-25 08:42:26 +00:00
Karol Wypchło e378e3adf9
Merge pull request #2215 from SkynetLabs/renovate/docker.elastic.co-elasticsearch-elasticsearch-7.x
chore(deps): update docker.elastic.co/elasticsearch/elasticsearch docker tag to v7.17.6
2022-08-24 18:13:03 +02:00
Karol Wypchło 1caaebbefe
Merge pull request #2216 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.2
2022-08-24 18:12:37 +02:00
Karol Wypchło a6403b94c1
Merge pull request #2217 from SkynetLabs/renovate/skynetlabs-webportal-nginx-0.x
chore(deps): update skynetlabs/webportal-nginx docker tag to v0.5.2
2022-08-24 18:12:19 +02:00
renovate[bot] 0e841cacda
chore(deps): update skynetlabs/webportal-nginx docker tag to v0.5.2 2022-08-24 15:48:09 +00:00
renovate[bot] 185fc811fb
chore(deps): update skynetlabs/pinner docker tag to v0.7.2 2022-08-24 15:48:04 +00:00
renovate[bot] eacdd78cc1
chore(deps): update docker.elastic.co/elasticsearch/elasticsearch docker tag to v7.17.6 2022-08-24 15:47:51 +00:00
Matthew Sevey 9ca5c48629
Merge pull request #2211 from SkynetLabs/renovate/skynetlabs-webportal-handshake-api-0.x
chore(deps): update skynetlabs/webportal-handshake-api docker tag to v0.1.2
2022-08-23 10:06:54 -04:00
Matthew Sevey 0aeb98ff76
Merge branch 'master' into renovate/skynetlabs-webportal-handshake-api-0.x 2022-08-23 10:04:41 -04:00
Matthew Sevey dfb5e32db5
Merge pull request #2212 from SkynetLabs/renovate/skynetlabs-webportal-health-check-0.x
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.5.0
2022-08-23 10:04:23 -04:00
Ivaylo Novakov 4a7ea93076
Cron is not a TTY. 2022-08-22 12:26:54 +02:00
Ivaylo Novakov 89f7b96d5e
Replace our in-house Jaeger cleanup script with their own container that does that. 2022-08-22 12:09:43 +02:00
Ivaylo Novakov 475bcc310a
Merge pull request #2213 from SkynetLabs/renovate/mongo-4.x
chore(deps): update mongo docker tag to v4.4.16
2022-08-22 11:57:08 +02:00
renovate[bot] d24edc4285
chore(deps): update mongo docker tag to v4.4.16 2022-08-20 01:41:23 +00:00
renovate[bot] d1e0ee0fe6
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.5.0 2022-08-19 17:21:24 +00:00
renovate[bot] ffd9af803a
chore(deps): update skynetlabs/webportal-handshake-api docker tag to v0.1.2 2022-08-19 17:21:19 +00:00
Christopher Schinnerl 655851cb69
Merge pull request #2208 from SkynetLabs/renovate/skynetlabs-skyd-1.x
chore(deps): update skynetlabs/skyd docker tag to v1.6.6
2022-08-18 17:45:23 +02:00
renovate[bot] 61e9d3170d
chore(deps): update skynetlabs/skyd docker tag to v1.6.6 2022-08-18 15:43:16 +00:00
Ivaylo Novakov 47cd62f793
Merge pull request #2203 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update skynetlabs/pinner docker tag to v0.7.1
2022-08-18 17:25:52 +02:00
renovate[bot] 36d65fadc8
chore(deps): update skynetlabs/pinner docker tag to v0.7.1 2022-08-18 15:25:26 +00:00
Ivaylo Novakov 96d876b1d2
Merge pull request #2207 from SkynetLabs/renovate/skynetlabs-webportal-health-check-0.x
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.4.0
2022-08-18 17:24:52 +02:00
renovate[bot] 8414d9b793
chore(deps): update skynetlabs/webportal-health-check docker tag to v0.4.0 2022-08-18 15:12:37 +00:00
Ivaylo Novakov c70bc4b953
Merge pull request #2206 from SkynetLabs/do-not-report-when-env-file-does-not-exist
do not report from dc when env file does not exist
2022-08-18 12:00:17 +02:00
Karol Wypchlo 169ca25d67
do not report from dc when env file does not exist 2022-08-16 10:36:54 +02:00
Karol Wypchło 36f37e9be8
Merge pull request #2205 from SkynetLabs/ivo/fix_dc
Fix the path at which `dc` looks for `.env`.
2022-08-16 10:24:25 +02:00
Ivaylo Novakov ab4468ebf5
Fix the path at which `dc` looks for `.env`. 2022-08-16 10:12:11 +02:00
Matthew Sevey e35a0c8354
Merge pull request #2204 from SkynetLabs/ivo/new_pinner
New pinner version.
2022-08-15 14:21:44 -04:00
Ivaylo Novakov 350d2e30fa
New pinner version. 2022-08-15 20:04:51 +02:00
Matthew Sevey 7deaf1c0b9
Merge pull request #2202 from SkynetLabs/allow-relative-call-to-dc-script
allow relative call to dc script
2022-08-15 09:47:59 -04:00
Ivaylo Novakov fd41aa0518
Merge pull request #2192 from SkynetLabs/remove-outdated-blocklist-scripts
remove outdated blocklist scripts
2022-08-15 10:30:47 +02:00
Karol Wypchło 5e1fd0dcf1
Merge branch 'master' into allow-relative-call-to-dc-script 2022-08-12 22:06:47 +02:00
Karol Wypchlo 063f0b0b7b
simplify script and add more information 2022-08-12 21:06:04 +02:00
Matthew Sevey fea1366075
Merge pull request #2201 from SkynetLabs/upgrade-docker-compose-version
upgrade docker compose to 3.8
2022-08-12 10:10:01 -04:00
Karol Wypchlo 747bc1659a
allow relative call to dc script 2022-08-11 23:29:27 +02:00
Karol Wypchlo ad423e9050
upgrade to 3.8 2022-08-11 23:13:03 +02:00
Karol Wypchło 259b25c8c1
Merge pull request #2193 from SkynetLabs/renovate/skynetlabs-skyd-1.x
chore(deps): update dependency skynetlabs/skyd to v1.6.5
2022-08-09 16:08:25 +02:00
renovate[bot] ed8a2e1f17
chore(deps): update dependency skynetlabs/skyd to v1.6.5 2022-08-09 14:06:38 +00:00
Karol Wypchlo e53a8ba46a
remove airtable blocklist scripts 2022-08-09 15:06:20 +02:00
Karol Wypchlo 9e1a8600a5
Revert "remove outdated blocklist scripts"
This reverts commit 0a26516bdf.
2022-08-09 15:05:11 +02:00
Karol Wypchlo 0a26516bdf
remove outdated blocklist scripts 2022-08-09 14:23:06 +02:00
Karol Wypchło 08dae2e238
Merge pull request #2191 from SkynetLabs/renovate/skynetlabs-webportal-nginx-0.x
chore(deps): update dependency skynetlabs/webportal-nginx to v0.5.1
2022-08-09 13:46:12 +02:00
renovate[bot] 1b1ecb2c11
chore(deps): update dependency skynetlabs/webportal-nginx to v0.5.1 2022-08-09 11:38:19 +00:00
Christopher Schinnerl 088bef8937
Merge pull request #2190 from SkynetLabs/add-args-to-skyd-example
add args to skyd service example
2022-08-09 10:24:19 +02:00
Karol Wypchlo 43d1da72fb
add args to skyd service example 2022-08-09 10:23:04 +02:00
Karol Wypchło 67313136df
Merge pull request #2189 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update dependency skynetlabs/pinner to v0.6.0
2022-08-05 16:25:15 +02:00
Karol Wypchło 60d767cf69
Merge pull request #2188 from SkynetLabs/renovate/skynetlabs-webportal-dnslink-api-0.x
chore(deps): update dependency skynetlabs/webportal-dnslink-api to v0.1.2
2022-08-05 16:25:06 +02:00
renovate[bot] 7a34fc914d
chore(deps): update dependency skynetlabs/pinner to v0.6.0 2022-08-05 14:24:20 +00:00
renovate[bot] d85f24428b
chore(deps): update dependency skynetlabs/webportal-dnslink-api to v0.1.2 2022-08-05 14:24:13 +00:00
Matthew Sevey d6a6f4f878
Merge pull request #2185 from SkynetLabs/karol/sky-1397-switch-to-using-docker-skyd-image-in
use skynetlabs/skyd image
2022-08-05 10:16:49 -04:00
Karol Wypchło c8ff1fb7f4
bump to v1.6.4 2022-08-05 16:14:20 +02:00
Karol Wypchło a63689ed53
Merge pull request #2186 from SkynetLabs/renovate/jaegertracing
chore(deps): update jaegertracing to v1.37.0
2022-08-05 16:01:56 +02:00
renovate[bot] 63465b930e
chore(deps): update jaegertracing to v1.37.0 2022-08-03 21:02:43 +00:00
Karol Wypchlo a7c18b85c1
use skynetlabs/skyd:1.6.3 2022-08-01 16:52:32 +02:00
Ivaylo Novakov fb2ba712f4
Merge pull request #2183 from SkynetLabs/renovate/skynetlabs-webportal-accounts-dashboard-2.x
chore(deps): update dependency skynetlabs/webportal-accounts-dashboard to v2.1.0
2022-08-01 16:37:23 +02:00
Ivaylo Novakov 7e2d69cc9f
Merge pull request #2182 from SkynetLabs/renovate/skynetlabs-skynet-accounts-1.x
chore(deps): update dependency skynetlabs/skynet-accounts to v1.3.0
2022-08-01 16:36:58 +02:00
Ivaylo Novakov 591ef6ab69
Merge pull request #2181 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update dependency skynetlabs/pinner to v0.5.0
2022-08-01 16:36:36 +02:00
Ivaylo Novakov 649914dc18
Merge pull request #2180 from SkynetLabs/renovate/skynetlabs-webportal-nginx-0.x
chore(deps): update dependency skynetlabs/webportal-nginx to v0.5.0
2022-08-01 16:36:02 +02:00
Karol Wypchlo aa0a91472b
use skynetlabs/skyd:1.6.2 2022-08-01 13:48:58 +02:00
renovate[bot] 45feb45d31
chore(deps): update dependency skynetlabs/webportal-accounts-dashboard to v2.1.0 2022-08-01 10:55:23 +00:00
renovate[bot] 1f13674785
chore(deps): update dependency skynetlabs/skynet-accounts to v1.3.0 2022-08-01 10:55:18 +00:00
renovate[bot] ad743b3a3d
chore(deps): update dependency skynetlabs/pinner to v0.5.0 2022-08-01 10:55:13 +00:00
renovate[bot] a78f1d2745
chore(deps): update dependency skynetlabs/webportal-nginx to v0.5.0 2022-07-29 12:10:54 +00:00
Karol Wypchło a41ea10f64
upgrade to handshakeorg/hsd:4.0.2 (#2179)
* use handshakeorg/hsd:4.0.2

* add --no-auth
2022-07-29 12:05:01 +02:00
PJ 82e869bf34
Update abuse-scanner compose file 2022-07-27 16:06:37 +02:00
Ivaylo Novakov c7d445e44a
Merge pull request #2177 from SkynetLabs/ivo/log_hsd
Show HSD logs by default.
2022-07-25 19:48:04 +02:00
Ivaylo Novakov 61f153efe6
Remove the var altogether. 2022-07-25 20:03:41 +03:00
Ivaylo Novakov 03df7c7b33
Show HSD logs by default. 2022-07-25 19:28:56 +03:00
Ivaylo Novakov deaf20306a
Merge pull request #2164 from SkynetLabs/improve-certbot-docs
add readme note about certbot plugin
2022-07-25 12:39:46 +02:00
Karol Wypchło 4ca5bb397e
Merge pull request #2176 from SkynetLabs/remove-codeql
remove codeql
2022-07-20 11:57:18 +02:00
Karol Wypchło f6fbf4242d
remove codeql 2022-07-19 10:51:28 +02:00
Michał Leszczyk 453f1210ab
Merge pull request #2175 from SkynetLabs/renovate/skynetlabs-webportal-nginx-0.x
chore(deps): update dependency skynetlabs/webportal-nginx to v0.4.0
2022-07-11 11:42:46 +02:00
renovate[bot] b636894aa2
chore(deps): update dependency skynetlabs/webportal-nginx to v0.4.0 2022-07-11 09:41:30 +00:00
Michał Leszczyk fb75018ce0
Merge pull request #2172 from SkynetLabs/renovate/skynetlabs-webportal-health-check-0.x
chore(deps): update dependency skynetlabs/webportal-health-check to v0.3.0
2022-07-11 11:09:03 +02:00
Michał Leszczyk 8ca17995e2
Merge pull request #2173 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update dependency skynetlabs/pinner to v0.4.1
2022-07-11 11:07:29 +02:00
Michał Leszczyk dd74ad8b3b
Merge pull request #2174 from SkynetLabs/renovate/skynetlabs-webportal-accounts-dashboard-2.x
chore(deps): update dependency skynetlabs/webportal-accounts-dashboard to v2
2022-07-11 11:07:09 +02:00
Michał Leszczyk d13a4ae154
Don't pass GATSBY_ env vars to dashboard anymore (#2163)
* Don't pass GATSBY_ env vars to dashboard anymore

* Bump dashboard image to 2.0.0
2022-07-11 11:03:19 +02:00
renovate[bot] 79c8cd997a
chore(deps): update dependency skynetlabs/webportal-accounts-dashboard to v2 2022-07-10 13:44:11 +00:00
renovate[bot] 2c3978babf
chore(deps): update dependency skynetlabs/pinner to v0.4.1 2022-07-08 15:29:01 +00:00
Karol Wypchło 2f2c90f83e
Merge branch 'master' into improve-certbot-docs 2022-07-08 10:50:58 +02:00
Karol Wypchlo f3ec6f5f33
cloudflare example 2022-07-08 10:49:19 +02:00
Karol Wypchło b2814a68d9
Merge pull request #2171 from SkynetLabs/karol/sky-1240-use-remote-sia-dockerfile-until-ansible
use remote sia dockerfile until ansible is ready to use image
2022-07-08 10:34:25 +02:00
Ivaylo Novakov 4f7729052c
Merge pull request #2166 from SkynetLabs/ivo/pinner_log_file
Define a log file for pinner.
2022-07-08 10:15:50 +02:00
renovate[bot] 60717027dd
chore(deps): update dependency skynetlabs/webportal-health-check to v0.3.0 2022-07-07 11:12:58 +00:00
Karol Wypchlo 266e9a9307
remove unused PORTAL_MODULES env variable 2022-07-06 18:51:01 +02:00
Karol Wypchlo dd5e362b2d
adjust command for new skyd container 2022-07-06 18:48:10 +02:00
Karol Wypchlo 5031229e18
remove dockerfile linter from this repository 2022-07-06 18:44:35 +02:00
Karol Wypchlo 241de3f2ae
use remote sia dockerfile 2022-07-06 18:40:24 +02:00
Matthew Sevey 7b3d8d1430
Merge pull request #2152 from SkynetLabs/add-davids-pub-key
Update authorized_keys
2022-07-06 10:46:53 -04:00
David Vorick a395f84cdb
Merge branch 'master' into add-davids-pub-key 2022-07-06 10:46:33 -04:00
Karol Wypchło 59af9b8ae6
Update setup-scripts/support/authorized_keys 2022-07-06 15:28:40 +02:00
Karol Wypchło 743b5940d6
Merge pull request #2170 from SkynetLabs/renovate/certbot-dns-route53-1.x
chore(deps): update dependency certbot/dns-route53 to v1.29.0
2022-07-06 10:48:30 +02:00
Karol Wypchło a6868085a6
Merge pull request #2165 from SkynetLabs/renovate/jaegertracing
chore(deps): update jaegertracing to v1.36.0
2022-07-06 10:48:19 +02:00
Ivaylo Novakov 44a0f74bd2
Merge pull request #2167 from SkynetLabs/renovate/skynetlabs-skynet-accounts-1.x
chore(deps): update dependency skynetlabs/skynet-accounts to v1.2.3
2022-07-06 10:04:50 +02:00
Ivaylo Novakov 1f2e274e55
Merge pull request #2168 from SkynetLabs/renovate/skynetlabs-pinner-0.x
chore(deps): update dependency skynetlabs/pinner to v0.4.0
2022-07-06 10:04:26 +02:00
Ivaylo Novakov 2d28208722
Merge pull request #2169 from SkynetLabs/renovate/mongo-4.x
chore(deps): update dependency mongo to v4.4.15
2022-07-06 09:44:27 +02:00
renovate[bot] 2941d33ee5
chore(deps): update dependency certbot/dns-route53 to v1.29.0 2022-07-06 02:53:05 +00:00
renovate[bot] 62e300ca0c
chore(deps): update dependency mongo to v4.4.15 2022-07-06 00:11:49 +00:00
renovate[bot] 04f3579f60
chore(deps): update dependency skynetlabs/pinner to v0.4.0 2022-07-05 15:35:57 +00:00
renovate[bot] 9e8def4c5d
chore(deps): update dependency skynetlabs/skynet-accounts to v1.2.3 2022-07-05 15:35:52 +00:00
Ivaylo Novakov 6bfc12287d
Clean up redundant code. 2022-07-05 17:11:41 +03:00
Ivaylo Novakov 919061a6ec
Define a log file for pinner. 2022-07-05 16:23:46 +03:00
renovate[bot] 975ede05f5
chore(deps): update jaegertracing to v1.36.0 2022-07-05 13:00:10 +00:00
Karol Wypchlo db579f6ebd
add readme note about certbot plugin 2022-07-01 16:40:34 +02:00
Michał Leszczyk beb6e2c3af
Merge pull request #2162 from SkynetLabs/renovate/docker.elastic.co-elasticsearch-elasticsearch-7.x
chore(deps): update dependency docker.elastic.co/elasticsearch/elasticsearch to v7.17.5
2022-06-29 13:46:31 +02:00
Ivaylo Novakov 5a47c89e59
Merge pull request #2150 from SkynetLabs/renovate/jaegertracing
chore(deps): update jaegertracing to v1.35.2
2022-06-29 11:18:25 +02:00
renovate[bot] b3d344ec81
chore(deps): update dependency docker.elastic.co/elasticsearch/elasticsearch to v7.17.5 2022-06-28 16:51:56 +00:00
Matthew Sevey 6343cff81b
Merge pull request #2161 from SkynetLabs/karol/sky-1133-set-codeowners-for-skynet-webportal
Create CODEOWNERS
2022-06-28 12:50:00 -04:00
Ivaylo Novakov c341e3e4f8
Merge pull request #2159 from SkynetLabs/renovate/skynetlabs-blocker-0.x
chore(deps): update dependency skynetlabs/blocker to v0.1.2
2022-06-28 11:37:40 +02:00
Ivaylo Novakov e3be698f34
Merge pull request #2160 from SkynetLabs/renovate/skynetlabs-abuse-scanner-0.x
chore(deps): update dependency skynetlabs/abuse-scanner to v0.2.0
2022-06-28 11:37:23 +02:00
Karol Wypchło dd192c11b2
Create CODEOWNERS 2022-06-28 10:36:30 +02:00
renovate[bot] 8bc3da2bfb
chore(deps): update dependency skynetlabs/abuse-scanner to v0.2.0 2022-06-27 18:16:48 +00:00
renovate[bot] b57dd97b24
chore(deps): update dependency skynetlabs/blocker to v0.1.2 2022-06-27 18:16:43 +00:00
Ivaylo Novakov d00a472b94
Merge pull request #2157 from SkynetLabs/renovate/skynetlabs-webportal-health-check-0.x
chore(deps): update dependency skynetlabs/webportal-health-check to v0.2.0
2022-06-27 16:15:01 +02:00
Ivaylo Novakov e4178ec85a
Merge pull request #2156 from SkynetLabs/renovate/skynetlabs-webportal-website-0.x
chore(deps): update dependency skynetlabs/webportal-website to v0.2.1
2022-06-27 16:14:45 +02:00
Ivaylo Novakov e9c7613c08
Merge pull request #2155 from SkynetLabs/renovate/skynetlabs-webportal-nginx-0.x
chore(deps): update dependency skynetlabs/webportal-nginx to v0.3.3
2022-06-27 16:14:23 +02:00
Ivaylo Novakov 6327e5a961
Merge pull request #2154 from SkynetLabs/renovate/skynetlabs-skynet-accounts-1.x
chore(deps): update dependency skynetlabs/skynet-accounts to v1.2.2
2022-06-27 16:14:07 +02:00
renovate[bot] fa156a208d
chore(deps): update dependency skynetlabs/webportal-health-check to v0.2.0 2022-06-27 14:11:14 +00:00
renovate[bot] 46d1099561
chore(deps): update dependency skynetlabs/webportal-website to v0.2.1 2022-06-27 14:11:08 +00:00
renovate[bot] cdf5c3f732
chore(deps): update dependency skynetlabs/webportal-nginx to v0.3.3 2022-06-27 14:11:03 +00:00
renovate[bot] f17e78f7c4
chore(deps): update dependency skynetlabs/skynet-accounts to v1.2.2 2022-06-27 11:01:11 +00:00
Matthew Sevey e273491360
Update authorized_keys 2022-06-25 23:48:35 -04:00
renovate[bot] a603879277
chore(deps): update jaegertracing to v1.35.2 2022-06-21 15:31:38 +00:00
31 changed files with 118 additions and 858 deletions

1
.github/CODEOWNERS vendored Normal file
View File

@ -0,0 +1 @@
* @kwypchlo @meeh0w

View File

@ -1,71 +0,0 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '32 21 * * 0'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
steps:
- name: Checkout repository
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

View File

@ -1,21 +0,0 @@
name: Dockerfile Lint
on:
push:
branches:
- master
pull_request:
jobs:
hadolint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
dockerfile:
- docker/sia/Dockerfile
steps:
- uses: actions/checkout@v3
- uses: hadolint/hadolint-action@v2.0.0
with:
dockerfile: ${{ matrix.dockerfile }}

View File

@ -8,23 +8,6 @@ supports is located at https://portal-docs.skynetlabs.com/.
Some scripts and setup documentation contained in this repository
(`skynet-webportal`) may be outdated and generally should not be used.
## Web application
Change current directory with `cd packages/website`.
Use `yarn start` to start the development server.
Use `yarn build` to compile the application to `/public` directory.
You can use the below build parameters to customize your web application.
- development example `GATSBY_API_URL=https://siasky.dev yarn start`
- production example `GATSBY_API_URL=https://siasky.net yarn build`
List of available parameters:
- `GATSBY_API_URL`: override api url (defaults to location origin)
## License
Skynet uses a custom [License](./LICENSE.md). The Skynet License is a source code license that allows you to use, modify
@ -33,19 +16,3 @@ and distribute the software, but you must preserve the payment mechanism in the
For the purposes of complying with our code license, you can use the following Siacoin address:
`fb6c9320bc7e01fbb9cd8d8c3caaa371386928793c736837832e634aaaa484650a3177d6714a`
## Running a Portal
For those interested in running a Webportal, head over to our developer docs [here](https://portal-docs.skynetlabs.com/) to learn more.
## Contributing
### Testing Your Code
Before pushing your code, you should verify that it will pass our online test suite.
**Cypress Tests**
Verify the Cypress test suite by doing the following:
1. In one terminal screen run `GATSBY_API_URL=https://siasky.net website serve`
1. In a second terminal screen run `yarn cypress run`

31
dc
View File

@ -5,56 +5,59 @@
# would use docker-compose with the only difference being that you don't need to specify compose files. For more
# information you can run `./dc` or `./dc help`.
if [ -f .env ]; then
OLD_IFS=$IFS
IFS=$'\n'
for x in $(grep -v '^#.*' .env); do export $x; done
IFS=$OLD_IFS
# get current working directory of this script and prefix all files with it to
# be able to call this script from anywhere and not only root directory of
# skynet-webportal project
cwd="$(dirname -- "$0";)";
# get portal modules configuration from .env file (if defined more than once, the last one is used)
if [[ -f "${cwd}/.env" ]]; then
PORTAL_MODULES=$(grep -e "^PORTAL_MODULES=" ${cwd}/.env | tail -1 | sed "s/PORTAL_MODULES=//")
fi
# include base docker compose file
COMPOSE_FILES="-f docker-compose.yml"
COMPOSE_FILES="-f ${cwd}/docker-compose.yml"
for i in $(seq 1 ${#PORTAL_MODULES}); do
# accounts module - alias "a"
if [[ ${PORTAL_MODULES:i-1:1} == "a" ]]; then
COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.accounts.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.accounts.yml"
fi
# blocker module - alias "b"
if [[ ${PORTAL_MODULES:i-1:1} == "b" ]]; then
COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.blocker.yml"
fi
# jaeger module - alias "j"
if [[ ${PORTAL_MODULES:i-1:1} == "j" ]]; then
COMPOSE_FILES+=" -f docker-compose.jaeger.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.jaeger.yml"
fi
# malware-scanner module - alias "s"
if [[ ${PORTAL_MODULES:i-1:1} == "s" ]]; then
COMPOSE_FILES+=" -f docker-compose.blocker.yml -f docker-compose.mongodb.yml -f docker-compose.malware-scanner.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.blocker.yml -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.malware-scanner.yml"
fi
# mongodb module - alias "m"
if [[ ${PORTAL_MODULES:i-1:1} == "m" ]]; then
COMPOSE_FILES+=" -f docker-compose.mongodb.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml"
fi
# abuse-scanner module - alias "u"
if [[ ${PORTAL_MODULES:i-1:1} == "u" ]]; then
COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse-scanner.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.blocker.yml -f ${cwd}/docker-compose.abuse-scanner.yml"
fi
# pinner module - alias "p"
if [[ ${PORTAL_MODULES:i-1:1} == "p" ]]; then
COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.pinner.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.pinner.yml"
fi
done
# override file if exists
if [[ -f docker-compose.override.yml ]]; then
COMPOSE_FILES+=" -f docker-compose.override.yml"
COMPOSE_FILES+=" -f ${cwd}/docker-compose.override.yml"
fi
docker-compose $COMPOSE_FILES $@

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -10,7 +10,7 @@ services:
abuse-scanner:
# uncomment "build" and comment out "image" to build from sources
# build: https://github.com/SkynetLabs/abuse-scanner.git#main
image: skynetlabs/abuse-scanner:0.1.1
image: skynetlabs/abuse-scanner:0.4.0
container_name: abuse-scanner
restart: unless-stopped
logging: *default-logging
@ -36,3 +36,6 @@ services:
depends_on:
- mongo
- blocker
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /tmp:/tmp

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -22,7 +22,7 @@ services:
accounts:
# uncomment "build" and comment out "image" to build from sources
# build: https://github.com/SkynetLabs/skynet-accounts.git#main
image: skynetlabs/skynet-accounts:1.2.0
image: skynetlabs/skynet-accounts:1.3.0
container_name: accounts
restart: unless-stopped
logging: *default-logging
@ -59,15 +59,12 @@ services:
# build:
# context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main
# dockerfile: Dockerfile
image: skynetlabs/webportal-accounts-dashboard:1.1.2
image: skynetlabs/webportal-accounts-dashboard:2.1.1
container_name: dashboard
restart: unless-stopped
logging: *default-logging
env_file:
- .env
environment:
- GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN}
- GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
volumes:
- ./docker/data/dashboard/.cache:/usr/app/.cache
- ./docker/data/dashboard/public:/usr/app/public

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -15,7 +15,7 @@ services:
blocker:
# uncomment "build" and comment out "image" to build from sources
# build: https://github.com/SkynetLabs/blocker.git#main
image: skynetlabs/blocker:0.1.1
image: skynetlabs/blocker:0.1.2
container_name: blocker
restart: unless-stopped
logging: *default-logging

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -21,7 +21,7 @@ services:
- JAEGER_REPORTER_LOG_SPANS=false
jaeger-agent:
image: jaegertracing/jaeger-agent:1.32.0
image: jaegertracing/jaeger-agent:1.38.1
command:
[
"--reporter.grpc.host-port=jaeger-collector:14250",
@ -43,7 +43,7 @@ services:
- jaeger-collector
jaeger-collector:
image: jaegertracing/jaeger-collector:1.32.0
image: jaegertracing/jaeger-collector:1.38.1
entrypoint: /wait_to_start.sh
container_name: jaeger-collector
restart: on-failure
@ -68,7 +68,7 @@ services:
- elasticsearch
jaeger-query:
image: jaegertracing/jaeger-query:1.32.0
image: jaegertracing/jaeger-query:1.38.1
entrypoint: /wait_to_start.sh
container_name: jaeger-query
restart: on-failure
@ -93,7 +93,7 @@ services:
- elasticsearch
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6
container_name: elasticsearch
restart: on-failure
logging: *default-logging

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -17,10 +17,6 @@ services:
- ./docker/clamav/clamd.conf:/etc/clamav/clamd.conf:ro
expose:
- 3310 # NEVER expose this outside of the local network!
deploy:
resources:
limits:
cpus: "${CLAMAV_CPU:-0.50}"
networks:
shared:
ipv4_address: 10.10.10.100

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -14,7 +14,7 @@ services:
- MONGODB_PASSWORD=${SKYNET_DB_PASS}
mongo:
image: mongo:4.4.14
image: mongo:4.4.17
command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet} --setParameter ShardingTaskExecutorPoolMinSize=10
container_name: mongo
restart: unless-stopped

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -10,12 +10,14 @@ services:
pinner:
# uncomment "build" and comment out "image" to build from sources
# build: https://github.com/SkynetLabs/pinner.git#main
image: skynetlabs/pinner:0.3.1
image: skynetlabs/pinner:0.7.8
container_name: pinner
restart: unless-stopped
logging: *default-logging
env_file:
- .env
volumes:
- ./docker/data/pinner/logs:/logs
environment:
- PINNER_LOG_LEVEL=${PINNER_LOG_LEVEL:-info}
expose:

View File

@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
x-logging: &default-logging
driver: json-file
@ -15,17 +15,19 @@ networks:
services:
sia:
build:
context: ./docker/sia
dockerfile: Dockerfile
args:
branch: portal-latest
# uncomment "build" and comment out "image" to build from sources
# build:
# context: https://github.com/SkynetLabs/docker-skyd.git#main
# dockerfile: scratch/Dockerfile
# args:
# branch: master
image: skynetlabs/skyd:1.6.9
command: --disable-api-security --api-addr :9980 --modules gctwra
container_name: sia
restart: unless-stopped
stop_grace_period: 5m
logging: *default-logging
environment:
- SIA_MODULES=gctwra
- SKYD_DISK_CACHE_ENABLED=${SKYD_DISK_CACHE_ENABLED:-true}
- SKYD_DISK_CACHE_SIZE=${SKYD_DISK_CACHE_SIZE:-53690000000} # 50GB
- SKYD_DISK_CACHE_MIN_HITS=${SKYD_DISK_CACHE_MIN_HITS:-3}
@ -41,7 +43,24 @@ services:
- 9980
certbot:
image: certbot/dns-route53:v1.28.0
# replace this image with the image supporting your dns provider from
# https://hub.docker.com/r/certbot/certbot and adjust CERTBOT_ARGS env variable
# note: you will need to authenticate your dns request so consult the plugin docs
# configuration https://eff-certbot.readthedocs.io/en/stable/using.html#dns-plugins
#
# =================================================================================
# example docker-compose.yml changes required for Cloudflare dns provider:
#
# image: certbot/dns-cloudflare
# environment:
# - CERTBOT_ARGS=--dns-cloudflare --dns-cloudflare-credentials /etc/letsencrypt/cloudflare.ini
#
# create ./docker/data/certbot/cloudflare.ini file with the following content:
# dns_cloudflare_api_token = <api key generated at https://dash.cloudflare.com/profile/api-tokens>
#
# make sure that the file has 0400 permissions with:
# chmod 0400 ./docker/data/certbot/cloudflare.ini
image: certbot/dns-route53:v1.31.0
entrypoint: sh /entrypoint.sh
container_name: certbot
restart: unless-stopped
@ -59,7 +78,7 @@ services:
# build:
# context: https://github.com/SkynetLabs/webportal-nginx.git#main
# dockerfile: Dockerfile
image: skynetlabs/webportal-nginx:0.3.1
image: skynetlabs/webportal-nginx:1.0.0
container_name: nginx
restart: unless-stopped
logging: *default-logging
@ -89,7 +108,7 @@ services:
# build:
# context: https://github.com/SkynetLabs/webportal-website.git#main
# dockerfile: Dockerfile
image: skynetlabs/webportal-website:0.2.0
image: skynetlabs/webportal-website:0.2.3
container_name: website
restart: unless-stopped
logging: *default-logging
@ -105,18 +124,11 @@ services:
- 9000
handshake:
image: skynetlabs/hsd:3.0.1
command: --chain-migrate=2 --wallet-migrate=1
image: handshakeorg/hsd:4.0.2
command: --chain-migrate=3 --no-wallet --no-auth --compact-tree-on-init --network=main --http-host=0.0.0.0
container_name: handshake
restart: unless-stopped
logging: *default-logging
environment:
- HSD_LOG_CONSOLE=false
- HSD_HTTP_HOST=0.0.0.0
- HSD_NETWORK=main
- HSD_PORT=12037
env_file:
- .env
volumes:
- ./docker/data/handshake/.hsd:/root/.hsd
networks:
@ -130,7 +142,7 @@ services:
# build:
# context: https://github.com/SkynetLabs/webportal-handshake-api.git#main
# dockerfile: Dockerfile
image: skynetlabs/webportal-handshake-api:0.1.1
image: skynetlabs/webportal-handshake-api:0.1.3
container_name: handshake-api
restart: unless-stopped
logging: *default-logging
@ -154,7 +166,7 @@ services:
# build:
# context: https://github.com/SkynetLabs/webportal-dnslink-api.git#main
# dockerfile: Dockerfile
image: skynetlabs/webportal-dnslink-api:0.1.1
image: skynetlabs/webportal-dnslink-api:0.2.1
container_name: dnslink-api
restart: unless-stopped
logging: *default-logging
@ -169,7 +181,7 @@ services:
# build:
# context: https://github.com/SkynetLabs/webportal-health-check.git#main
# dockerfile: Dockerfile
image: skynetlabs/webportal-health-check:0.1.3
image: skynetlabs/webportal-health-check:1.0.0
container_name: health-check
restart: unless-stopped
logging: *default-logging

View File

@ -1,16 +0,0 @@
FROM golang:1.16.7 AS sia-builder
ENV GOOS linux
ENV GOARCH amd64
ARG branch=portal-latest
RUN git clone https://gitlab.com/SkynetLabs/skyd.git Sia --single-branch --branch ${branch} && \
make release --directory Sia
FROM nebulouslabs/sia:1.5.6
COPY --from=sia-builder /go/bin/ /usr/bin/
RUN if [ -f "/usr/bin/skyd" ]; then mv /usr/bin/skyd /usr/bin/siad; fi && \
if [ -f "/usr/bin/skyc" ]; then mv /usr/bin/skyc /usr/bin/siac; fi

View File

@ -50,6 +50,7 @@ aws s3 sync --no-progress /home/user/skynet-webportal/docker/data/nginx/logs s3:
# generate and sync skylinks dump
SKYLINKS_PATH=logs/skylinks/$(date +"%Y-%m-%d").log
mkdir -p /home/user/skynet-webportal/logs/skylinks # ensure path exists
find /home/user/skynet-webportal/logs/skylinks -type f -mtime +7 -delete # delete skylink dumps older than 7 days
docker exec sia siac skynet ls --recursive --alert-suppress > /home/user/skynet-webportal/${SKYLINKS_PATH}
aws s3 cp --no-progress /home/user/skynet-webportal/${SKYLINKS_PATH} s3://${BUCKET_NAME}/${SERVER_PREFIX}/${SKYLINKS_PATH}

View File

@ -3,8 +3,6 @@
# This script is for manual skylink blocking. It accepts either a single
# skylink or a file containing list of skylinks. The script is intented
# for manual use and it should be run locally on each skynet webportal server.
# The automatic script that is used to continuously sync an Airtable sheet
# list with the blocklist on the web portals is /setup-scripts/blocklist-airtable.py
set -e # exit on first error

View File

@ -1,164 +0,0 @@
#!/usr/bin/env python3
import curator
import elasticsearch
import os
import ssl
import sys
TIMEOUT = 120
def main():
if len(sys.argv) != 3:
print(
'USAGE: [INDEX_PREFIX=(default "")] [ARCHIVE=(default false)] ... {} NUM_OF_DAYS http://HOSTNAME[:PORT]'.format(
sys.argv[0]
)
)
print(
"NUM_OF_DAYS ... delete indices that are older than the given number of days."
)
print(
"HOSTNAME ... specifies which Elasticsearch hosts URL to search and delete indices from."
)
print(
"TIMEOUT ... number of seconds to wait for master node response, default: {}".format(
TIMEOUT
)
)
print("INDEX_PREFIX ... specifies index prefix.")
print("INDEX_DATE_SEPARATOR ... specifies index date separator.")
print(
"ARCHIVE ... specifies whether to remove archive indices (only works for rollover) (default false)."
)
print(
"ROLLOVER ... specifies whether to remove indices created by rollover (default false)."
)
print("ES_USERNAME ... The username required by Elasticsearch.")
print("ES_PASSWORD ... The password required by Elasticsearch.")
print("ES_TLS ... enable TLS (default false).")
print("ES_TLS_CA ... Path to TLS CA file.")
print("ES_TLS_CERT ... Path to TLS certificate file.")
print("ES_TLS_KEY ... Path to TLS key file.")
print(
"ES_TLS_SKIP_HOST_VERIFY ... (insecure) Skip server's certificate chain and host name verification."
)
sys.exit(1)
client = create_client(
os.getenv("ES_USERNAME"),
os.getenv("ES_PASSWORD"),
str2bool(os.getenv("ES_TLS", "false")),
os.getenv("ES_TLS_CA"),
os.getenv("ES_TLS_CERT"),
os.getenv("ES_TLS_KEY"),
str2bool(os.getenv("ES_TLS_SKIP_HOST_VERIFY", "false")),
)
ilo = curator.IndexList(client)
empty_list(ilo, "Elasticsearch has no indices")
prefix = os.getenv("INDEX_PREFIX", "")
if prefix != "":
prefix += "-"
separator = os.getenv("INDEX_DATE_SEPARATOR", "-")
if str2bool(os.getenv("ARCHIVE", "false")):
filter_archive_indices_rollover(ilo, prefix)
else:
if str2bool(os.getenv("ROLLOVER", "false")):
filter_main_indices_rollover(ilo, prefix)
else:
filter_main_indices(ilo, prefix, separator)
empty_list(ilo, "No indices to delete")
for index in ilo.working_list():
print("Removing", index)
timeout = int(os.getenv("TIMEOUT", TIMEOUT))
delete_indices = curator.DeleteIndices(ilo, master_timeout=timeout)
delete_indices.do_action()
def filter_main_indices(ilo, prefix, separator):
date_regex = "\d{4}" + separator + "\d{2}" + separator + "\d{2}"
time_string = "%Y" + separator + "%m" + separator + "%d"
ilo.filter_by_regex(
kind="regex", value=prefix + "jaeger-(span|service|dependencies)-" + date_regex
)
empty_list(ilo, "No indices to delete")
# This excludes archive index as we use source='name'
# source `creation_date` would include archive index
ilo.filter_by_age(
source="name",
direction="older",
timestring=time_string,
unit="days",
unit_count=int(sys.argv[1]),
)
def filter_main_indices_rollover(ilo, prefix):
ilo.filter_by_regex(kind="regex", value=prefix + "jaeger-(span|service)-\d{6}")
empty_list(ilo, "No indices to delete")
# do not remove active write indices
ilo.filter_by_alias(aliases=[prefix + "jaeger-span-write"], exclude=True)
empty_list(ilo, "No indices to delete")
ilo.filter_by_alias(aliases=[prefix + "jaeger-service-write"], exclude=True)
empty_list(ilo, "No indices to delete")
ilo.filter_by_age(
source="creation_date",
direction="older",
unit="days",
unit_count=int(sys.argv[1]),
)
def filter_archive_indices_rollover(ilo, prefix):
# Remove only rollover archive indices
# Do not remove active write archive index
ilo.filter_by_regex(kind="regex", value=prefix + "jaeger-span-archive-\d{6}")
empty_list(ilo, "No indices to delete")
ilo.filter_by_alias(aliases=[prefix + "jaeger-span-archive-write"], exclude=True)
empty_list(ilo, "No indices to delete")
ilo.filter_by_age(
source="creation_date",
direction="older",
unit="days",
unit_count=int(sys.argv[1]),
)
def empty_list(ilo, error_msg):
try:
ilo.empty_list_check()
except curator.NoIndices:
print(error_msg)
sys.exit(0)
def str2bool(v):
return v.lower() in ("true", "1")
def create_client(username, password, tls, ca, cert, key, skipHostVerify):
context = ssl.create_default_context()
if ca is not None:
context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=ca)
elif skipHostVerify:
context.check_hostname = False
context.verify_mode = ssl.CERT_NONE
if username is not None and password is not None:
return elasticsearch.Elasticsearch(
sys.argv[2:], http_auth=(username, password), ssl_context=context
)
elif tls:
context.load_cert_chain(certfile=cert, keyfile=key)
return elasticsearch.Elasticsearch(sys.argv[2:], ssl_context=context)
else:
return elasticsearch.Elasticsearch(sys.argv[2:], ssl_context=context)
if __name__ == "__main__":
main()

View File

@ -1,16 +0,0 @@
#! /usr/bin/env bash
###############################################################
# this script is an automation for restarting docker containers
# on maintenance nodes strictly built for purpose of siasky.net
###############################################################
set -e # exit on first error
docker build --no-cache --quiet --build-arg branch=master -t sia-master /home/user/sia-dockerfile
for container in `docker container ls --format '{{.Names}}'`; do
docker stop $container
docker rm $container
docker run -d -v /home/user/nodes/$container/sia-data:/sia-data --env-file /home/user/nodes/$container/.env --name $container --log-opt max-size=100m --log-opt max-file=3 sia-master
done

View File

@ -1,18 +0,0 @@
#!/bin/bash
set -e # exit on first error
# get current working directory (pwd doesn't cut it)
cwd=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
# put the server down for maintenance
. ${cwd}/portal-down.sh
# stop the docker services
docker-compose down
# start the docker services
docker-compose up -d
# enable the server again
. ${cwd}/portal-up.sh

View File

@ -1,26 +0,0 @@
#!/bin/bash
set -e # exit on first error
# get current working directory (pwd doesn't cut it)
cwd=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
# put the server down for maintenance
. ${cwd}/portal-down.sh
# build all container without cache
docker-compose build --no-cache --parallel --pull --quiet
# stop the docker services
docker-compose down -v
# clear unused docker containers so we don't run into out of disk space
# it should be done after the container have been stopped and before
# building them again
docker system prune --force
# start the docker services
docker-compose up -d
# enable the server again
. ${cwd}/portal-up.sh

View File

@ -1,155 +0,0 @@
# Skynet Portal Setup Scripts
> :warning: This documentation is outdated and should be used for reference
only. Portal setup documentation is located at
https://portal-docs.skynetlabs.com/.
This directory contains a setup guide and scripts that will install and
configure some basic requirements for running a Skynet Portal. The assumption is
that we are working with a Debian Buster Minimal system or similar.
## Latest Setup Documentation
Latest Skynet Webportal setup documentation and the setup process Skynet Labs
supports is located at https://docs.siasky.net/webportal-management/overview.
Some of the scripts and setup documentation contained in this repository
(`skynet-webportal`) can be outdated and generally should not be used.
## Initial Setup
You may want to fork this repository and replace ssh keys in
`setup-scripts/support/authorized_keys` and optionally edit the `setup-scripts/support/tmux.conf` and `setup-scripts/support/bashrc` configurations to fit your needs.
### Step 0: stack overview
- dockerized services inside `docker-compose.yml`
- [sia](https://sia.tech) ([docker hub](https://hub.docker.com/r/nebulouslabs/sia)): storage provider, heart of the portal setup
- [caddy](https://caddyserver.com) ([docker hub](https://hub.docker.com/r/caddy/caddy)): reverse proxy (similar to nginx) that handles ssl out of a box and acts as a transparent entry point
- [openresty](https://openresty.org) ([docker hub](https://hub.docker.com/r/openresty/openresty)): nginx custom build, acts as a cached proxy to siad and exposes all api endpoints
- [health-check](https://github.com/SkynetLabs/skynet-webportal/tree/master/packages/health-check): simple service that runs periodically and collects health data about the server (status and response times) - [read more](https://github.com/SkynetLabs/skynet-webportal/blob/master/packages/health-check/README.md)
- [handshake](https://handshake.org) ([github](https://github.com/handshake-org/hsd)): full handshake node
- [handshake-api](https://github.com/SkynetLabs/skynet-webportal/tree/master/packages/handshake-api): simple API talking to the handshake node - [read more](https://github.com/SkynetLabs/skynet-webportal/blob/master/packages/handshake-api/README.md)
- [website](https://github.com/SkynetLabs/skynet-webportal/tree/master/packages/website): portal frontend application - [read more](https://github.com/SkynetLabs/skynet-webportal/blob/master/packages/website/README.md)
- discord integration
- [funds-checker](funds-checker.py): script that checks wallet balance and sends status messages to discord periodically
- [health-checker](health-checker.py): script that monitors health-check service for server health issues and reports them to discord periodically
- [log-checker](log-checker.py): script that scans siad logs for critical errors and reports them to discord periodically
- [blocklist-skylink](../scripts/blocklist-skylink.sh): script that can be run locally from a machine that has access to all your skynet portal servers that blocklists provided skylink and prunes nginx cache to ensure it's not available any more (that is a bit much but that's the best we can do right now without paid nginx version) - if you want to use it, make sure to adjust the server addresses
### Step 1: setting up server user
1. SSH in a freshly installed Debian machine on a user with sudo access (can be root)
1. `apt-get update && apt-get install sudo libnss3-tools -y` to make sure `sudo` is available
1. `adduser user` to create user called `user` (creates `/home/user` directory)
1. `usermod -aG sudo user` to add this new user to sudo group
1. `sudo groupadd docker` to create a group for docker (it might already exist)
1. `sudo usermod -aG docker user` to add your user to that group
1. Quit the ssh session with `exit` command
You can now ssh into your machine as the user `user`.
### Step 2: setting up environment
1. On your local machine: `ssh-copy-id user@ip-addr` to copy over your ssh key to server
1. On your local machine: `ssh user@ip-addr` to log in to server as user `user`
1. You are now logged in as `user`
**Following step will be executed on remote host logged in as a `user`:**
1. `sudo apt-get install git -y` to install git
1. `git clone https://github.com/SkynetLabs/skynet-webportal`
1. `cd skynet-webportal`
1. run setup scripts in the exact order and provide sudo password when asked (if one of them fails, you can retry just this one before proceeding further)
1. `/home/user/skynet-webportal/setup-scripts/setup-server.sh`
1. `/home/user/skynet-webportal/setup-scripts/setup-docker-services.sh`
1. `/home/user/skynet-webportal/setup-scripts/setup-health-check-scripts.sh` (optional)
### Step 3: configuring siad
At this point we have almost everything running, we just need to set up your wallet and allowance:
1. Create a new wallet (remember to save the seed)
> `docker exec -it sia siac wallet init`
1. Unlock the wallet (use the seed as password)
> `docker exec -it sia siac wallet unlock`
1. Generate a new wallet address (save it for later to transfer the funds)
> `docker exec -it sia siac wallet address`
1. Set up allowance
> `docker exec -it sia siac renter setallowance`
1. 10 KS (keep 25 KS in your wallet)
1. default period
1. default number of hosts
1. 4 week renewal time
1. 500 GB expected storage
1. 500 GB expected upload
1. 5 TB expected download
1. default redundancy
1. Set a maximum storage price
> `docker exec -it sia siac renter setallowance --max-storage-price 100SC`
1. Instruct siad to start making 10 contracts per block with many hosts to potentially view the whole network's files
> `docker exec -it sia siac renter setallowance --payment-contract-initial-funding 10SC`
### Step 4: configuring docker services
1. edit `/home/user/skynet-webportal/.env` and configure following environment variables
- `PORTAL_DOMAIN` (required) is a skynet portal domain (ex. siasky.net)
- `SERVER_DOMAIN` (optional) is an optional direct server domain (ex. eu-ger-1.siasky.net) - leave blank unless it is different than PORTAL_DOMAIN
- `EMAIL_ADDRESS` is your email address used for communication regarding SSL certification (required if you're using http-01 challenge)
- `SIA_WALLET_PASSWORD` is your wallet password (or seed if you did not set a password)
- `HSD_API_KEY` this is a random security key for a handshake integration that gets generated automatically
- `CLOUDFLARE_AUTH_TOKEN` (optional) if using cloudflare as dns loadbalancer (need to change it in Caddyfile too)
- `AWS_ACCESS_KEY_ID` (optional) if using route53 as a dns loadbalancer
- `AWS_SECRET_ACCESS_KEY` (optional) if using route53 as a dns loadbalancer
- `DISCORD_WEBHOOK_URL` (required if using Discord notifications) discord webhook url (generate from discord app)
- `DISCORD_MENTION_USER_ID` (optional) add `/cc @user` mention to important messages from webhook (has to be id not user name)
- `DISCORD_MENTION_ROLE_ID` (optional) add `/cc @role` mention to important messages from webhook (has to be id not role name)
- `SKYNET_DB_USER` (optional) if using `accounts` this is the MongoDB username
- `SKYNET_DB_PASS` (optional) if using `accounts` this is the MongoDB password
- `SKYNET_DB_HOST` (optional) if using `accounts` this is the MongoDB address or container name
- `SKYNET_DB_PORT` (optional) if using `accounts` this is the MongoDB port
- `COOKIE_DOMAIN` (optional) if using `accounts` this is the domain to which your cookies will be issued
- `COOKIE_HASH_KEY` (optional) if using `accounts` hashing secret, at least 32 bytes
- `COOKIE_ENC_KEY` (optional) if using `accounts` encryption key, at least 32 bytes
- `S3_BACKUP_PATH` (optional) is using `accounts` and backing up the databases to S3. This path should be an S3 bucket
with path to the location in the bucket where we want to store the daily backups.
1. `docker-compose up -d` to restart the services so they pick up new env variables
## Subdomains
It might prove useful for certain skapps to be accessible through a custom subdomain. So instead of being accessed through `https://portal.com/[skylink]`, it would be accessible through `https://[skylink_base32].portal.com`. We call this "subdomain access" and it is made possible by encoding Skylinks using a base32 encoding. We have to use a base32 encoding scheme because subdomains have to be all lower case and the base64 encoded Skylink is case sensitive and thus might contain uppercase characters.
You can convert Skylinks using this [converter skapp](https://convert-skylink.hns.siasky.net). To see how the encoding and decoding works, please follow the link to the repo in the application itself.
There is also an option to access handshake domain through the subdomain using `https://[domain_name].hns.portal.com`.
To configure this on your portal, you have to make sure to configure the following:
## Useful Commands
- Starting the whole stack
> `docker-compose up -d`
- Stopping the whole stack
> `docker-compose down`
- Accessing siac
> `docker exec -it sia siac`
- Portal maintenance
- Pulling portal out for maintenance
> `scripts/portal-down.sh`
- Putting portal back into place after maintenance
> `scripts/portal-up.sh`
- Upgrading portal containers (takes care of pulling it and putting it back)
> `scripts/portal-upgrade.sh`
- Restarting caddy gracefully after making changes to Caddyfile (no downtime)
> `docker exec caddy caddy reload --config /etc/caddy/Caddyfile`
- Restarting nginx gracefully after making changes to nginx configs (no downtime)
> `docker exec nginx openresty -s reload`
- Checking siad service logs (since last hour)
> `docker logs --since 1h $(docker ps -q --filter "name=^sia$")`
- Checking caddy logs (for example in case ssl certificate fails)
> `docker logs caddy -f`
- Checking nginx logs (nginx handles all communication to siad instances)
> `tail -n 50 docker/data/nginx/logs/access.log` to follow last 50 lines of access log
> `tail -n 50 docker/data/nginx/logs/error.log` to follow last 50 lines of error log

View File

@ -1,161 +0,0 @@
#!/usr/bin/env python3
from bot_utils import get_api_password, setup, send_msg
from random import randint
from time import sleep
import traceback
import os
import sys
import asyncio
import requests
import json
from requests.auth import HTTPBasicAuth
setup()
AIRTABLE_API_KEY = os.getenv("AIRTABLE_API_KEY")
AIRTABLE_BASE = os.getenv("AIRTABLE_BASE")
AIRTABLE_TABLE = os.getenv("AIRTABLE_TABLE")
AIRTABLE_FIELD = os.getenv("AIRTABLE_FIELD")
# Check environment variables are defined
for value in [AIRTABLE_API_KEY, AIRTABLE_BASE, AIRTABLE_TABLE, AIRTABLE_FIELD]:
if not value:
sys.exit("Configuration error: Missing AirTable environment variable.")
async def run_checks():
try:
await block_skylinks_from_airtable()
except: # catch all exceptions
trace = traceback.format_exc()
await send_msg("```\n{}\n```".format(trace), force_notify=True)
def exec(command):
return os.popen(command).read().strip()
async def block_skylinks_from_airtable():
# Get sia IP before doing anything else. If this step fails we don't
# need to continue with the execution of the script.
ipaddress = exec(
"docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia"
)
if ipaddress == "":
print("Skyd IP could not be detected. Exiting.")
return
print("Pulling blocked skylinks from Airtable via api integration")
headers = {"Authorization": "Bearer " + AIRTABLE_API_KEY}
skylinks = []
offset = None
retry = 0
while len(skylinks) == 0 or offset:
print(
"Requesting a batch of records from Airtable with "
+ (offset if offset else "empty")
+ " offset"
+ (" (retry " + str(retry) + ")" if retry else "")
)
query = "&".join(
["fields%5B%5D=" + AIRTABLE_FIELD, ("offset=" + offset) if offset else ""]
)
response = requests.get(
"https://api.airtable.com/v0/"
+ AIRTABLE_BASE
+ "/"
+ AIRTABLE_TABLE
+ "?"
+ query,
headers=headers,
)
# rate limited - sleep for 2-10 secs and retry (up to 100 times, ~10 minutes)
# https://support.airtable.com/hc/en-us/articles/203313985-Public-REST-API
# > 5 requests per second, per base
if response.status_code == 429:
if retry < 100:
retry = retry + 1
sleep(randint(1, 10))
continue
else:
return await send_msg(
"Airtable: too many retries, aborting!", force_notify=True
)
retry = 0 # reset retry counter
if response.status_code != 200:
status_code = str(response.status_code)
response_text = response.text or "empty response"
message = (
"Airtable blocklist integration responded with code "
+ status_code
+ ": "
+ response_text
)
return await send_msg(message, force_notify=False)
data = response.json()
if len(data["records"]) == 0:
return print(
"Airtable returned 0 records - make sure your configuration is correct"
)
skylinks = skylinks + [
entry["fields"].get(AIRTABLE_FIELD, "") for entry in data["records"]
]
skylinks = [
skylink.strip() for skylink in skylinks if skylink
] # filter empty skylinks, most likely empty rows, trim whitespace
offset = data.get("offset")
print(
"Sending /skynet/blocklist request with "
+ str(len(skylinks))
+ " skylinks to siad"
)
response = requests.post(
"http://" + ipaddress + ":9980/skynet/blocklist",
data=json.dumps({"add": skylinks}),
headers={"User-Agent": "Sia-Agent"},
auth=HTTPBasicAuth("", get_api_password()),
)
if response.status_code != 200:
status_code = str(response.status_code)
response_text = response.text or "empty response"
message = (
"Airtable blocklist request responded with code "
+ status_code
+ ": "
+ response_text
)
return await send_msg(message, force_notify=False)
response_json = json.loads(response.text)
invalid_skylinks = response_json["invalids"]
if invalid_skylinks is None:
return await send_msg("Blocklist successfully updated all skylinks")
return await send_msg(
"Blocklist responded ok but failed to update "
+ str(len(invalid_skylinks))
+ " skylinks: "
+ json.dumps(invalid_skylinks)
)
loop = asyncio.get_event_loop()
loop.run_until_complete(run_checks())
# --- BASH EQUIVALENT
# skylinks=$(curl "https://api.airtable.com/v0/${AIRTABLE_BASE}/${AIRTABLE_TABLE}?fields%5B%5D=${AIRTABLE_FIELD}" -H "Authorization: Bearer ${AIRTABLE_KEY}" | python3 -c "import sys, json; print('[\"' + '\",\"'.join([entry['fields']['Link'] for entry in json.load(sys.stdin)['records']]) + '\"]')")
# ipaddress=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia)
# curl --data "{\"add\" : ${skylinks}}" "${ipaddress}:8000/skynet/blocklist"

View File

@ -232,8 +232,7 @@ async def check_health():
message += "{}/{} CRITICAL checks failed over the last {} hours! ".format(
critical_checks_failed, critical_checks_total, CHECK_HOURS
)
# Disabling as it creates notification fatigue.
# force_notify = True
force_notify = True
else:
message += "All {} critical checks passed. ".format(critical_checks_total)
@ -241,8 +240,7 @@ async def check_health():
message += "{}/{} extended checks failed over the last {} hours! ".format(
extended_checks_failed, extended_checks_total, CHECK_HOURS
)
# Disabling as it creates notification fatigue.
# force_notify = True
force_notify = True
else:
message += "All {} extended checks passed. ".format(extended_checks_total)

View File

@ -0,0 +1,16 @@
/home/user/skynet-webportal/docker/data/nginx/logs/*.log {
daily
rotate 3650
minsize 500M
create 644 root root
notifempty
dateext
missingok
compress
compressoptions --best
delaycompress
sharedscripts
postrotate
docker exec nginx nginx -s reopen
endscript
}

View File

@ -0,0 +1,11 @@
/home/user/skynet-webportal/docker/data/pinner/*.log {
daily
rotate 10
minsize 100M
copytruncate
notifempty
dateext
missingok
compress
compressoptions --best
}

View File

@ -0,0 +1,12 @@
/home/user/skynet-webportal/docker/data/sia/*.log
/home/user/skynet-webportal/docker/data/sia/*/*.log {
daily
rotate 10
minsize 100M
copytruncate
notifempty
dateext
missingok
compress
compressoptions --best
}

View File

@ -1,48 +0,0 @@
#! /usr/bin/env bash
set -e # exit on first error
# Install docker (cleans up old docker installation)
# sudo apt-get remove -y docker docker-engine docker.io containerd runc # fails if it is the first installation
sudo apt-get update
sudo apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
sudo apt-get update
sudo apt-get install -y docker-ce docker-ce-cli containerd.io
docker --version # sanity check
# add user to docker group to avoid having to use sudo for every docker command
sudo usermod -aG docker user
# Install docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
docker-compose --version # sanity check
# Create dummy .env file for docker-compose usage with variables
# * PORTAL_DOMAIN - (required) is a skynet portal domain (ex. siasky.net)
# * SERVER_DOMAIN - (optional) is an optional direct server domain (ex. eu-ger-1.siasky.net) - leave blank unless it is different than PORTAL_DOMAIN
# * EMAIL_ADDRESS - this is the administrator contact email you need to supply for communication regarding SSL certification
# * HSD_API_KEY - this is auto generated secure key for your handshake service integration
# * CLOUDFLARE_AUTH_TOKEN - (optional) if using cloudflare as dns loadbalancer (need to change it in Caddyfile too)
# * AWS_ACCESS_KEY_ID - (optional) if using route53 as a dns loadbalancer
# * AWS_SECRET_ACCESS_KEY - (optional) if using route53 as a dns loadbalancer
# * API_PORT - (optional) the port on which siad is listening, defaults to 9980
# * DISCORD_WEBHOOK_URL - (required if using Discord notifications) discord webhook url (generate from discord app)
# * DISCORD_MENTION_USER_ID - (optional) add `/cc @user` mention to important messages from webhook (has to be id not user name)
# * DISCORD_MENTION_ROLE_ID - (optional) add `/cc @role` mention to important messages from webhook (has to be id not role name)
# * SKYNET_DB_USER - (optional) if using `accounts` this is the MongoDB username
# * SKYNET_DB_PASS - (optional) if using `accounts` this is the MongoDB password
# * SKYNET_DB_HOST - (optional) if using `accounts` this is the MongoDB address or container name
# * SKYNET_DB_PORT - (optional) if using `accounts` this is the MongoDB port
# * COOKIE_DOMAIN - (optional) if using `accounts` this is the domain to which your cookies will be issued
# * COOKIE_HASH_KEY - (optional) if using `accounts` hashing secret, at least 32 bytes
# * COOKIE_ENC_KEY - (optional) if using `accounts` encryption key, at least 32 bytes
if ! [ -f /home/user/skynet-webportal/.env ]; then
HSD_API_KEY=$(openssl rand -base64 32) # generate safe random key for handshake
printf "PORTAL_DOMAIN=siasky.net\nSERVER_DOMAIN=\nEMAIL_ADDRESS=email@example.com\nSIA_WALLET_PASSWORD=\nHSD_API_KEY=${HSD_API_KEY}\nCLOUDFLARE_AUTH_TOKEN=\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nDISCORD_WEBHOOK_URL=\nDISCORD_MENTION_USER_ID=\nDISCORD_MENTION_ROLE_ID=\n" > /home/user/skynet-webportal/.env
fi
# Start docker container with nginx and client
docker-compose -f docker-compose.yml up --build -d

View File

@ -1,11 +0,0 @@
#! /usr/bin/env bash
set -e # exit on first error
sudo apt-get update
sudo apt-get -y install python3-pip
pip3 install discord-webhook python-dotenv requests elasticsearch-curator
# add cron entries to user crontab
crontab -u user /home/user/skynet-webportal/setup-scripts/support/crontab

View File

@ -1,48 +0,0 @@
#! /usr/bin/env bash
set -e # exit on first error
# Copy over basic configuration files
cp /home/user/skynet-webportal/setup-scripts/support/tmux.conf /home/user/.tmux.conf
cp /home/user/skynet-webportal/setup-scripts/support/bashrc /home/user/.bashrc
source /home/user/.bashrc
# Add SSH keys and set SSH configs
sudo cp /home/user/skynet-webportal/setup-scripts/support/ssh_config /etc/ssh/ssh_config
mkdir -p /home/user/.ssh
# cat /home/user/skynet-webportal/setup-scripts/support/authorized_keys >> /home/user/.ssh/authorized_keys
# Install apt packages
sudo apt-get update
sudo apt-get -y install ufw tmux ranger htop nload gcc g++ make git vim unzip curl awscli
# Setup GIT credentials (so commands like git stash would work)
git config --global user.email "devs@nebulous.tech"
git config --global user.name "Sia Dev"
# Setup firewall
sudo ufw --force enable # --force to make it non-interactive
sudo ufw logging low # enable logging for debugging purpose: tail -f /var/log/ufw.log
sudo ufw allow ssh # allow ssh connection to server
sudo ufw allow 80,443/tcp # allow http and https ports
# Block outgoing traffic to local networks
# https://community.hetzner.com/tutorials/block-outgoing-traffic-to-private-networks
sudo ufw deny out from any to 10.0.0.0/8
sudo ufw deny out from any to 172.16.0.0/12
sudo ufw deny out from any to 192.168.0.0/16
sudo ufw deny out from any to 100.64.0.0/10
sudo ufw deny out from any to 198.18.0.0/15
sudo ufw deny out from any to 169.254.0.0/16
# OPTIONAL: terminfo for alacritty terminal via ssh
# If you don't use the alacritty terminal you can remove this step.
wget -c https://raw.githubusercontent.com/alacritty/alacritty/master/extra/alacritty.info
sudo tic -xe alacritty,alacritty-direct alacritty.info
rm alacritty.info
# Set up file limits - siad uses a lot so we need to adjust so it doesn't choke up
sudo cp /home/user/skynet-webportal/setup-scripts/support/limits.conf /etc/security/limits.conf
# Set UTC timezone so all of the servers report the same time
sudo timedatectl set-timezone UTC

View File

@ -6,6 +6,5 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG67M3zC4eDJEjma0iKKksGclteKbB86ONQtBaWY93M6
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF+XC8f0dumhzDE93i9IIMsMp7/MJPwGH+Uc9JFKOvyw karol@siasky.net
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM43lzbKjFLChe5rKETxDpWpNlqXCGTBPiWlDN2vlLD pj@siasky.net
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6Kcx8yetova4/ALUQHigo/PBMJO33ZTKOsg2jxSO2a user@deploy.siasky.dev
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcenWnMQ6q/OEC4ZmQgjLDV2obWlR3fENV0zRGFvJF+ marcins@siasky.net
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB7prtVOTwtcSN9HkXum107RwcW5H8Vggx6Qv7T57ItT daniel@siasky.net
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH+4IrfEM9H16jqvPZncHkWWoHO4/BVq7d4pEyzK4e0W michal.leszczyk@skynetlabs.com
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHptEpqs57lhnHkfa+0SQgXQ4A63/YGV2cNTcGMQW+Jt david@skynetlabs.com

View File

@ -1,7 +1,6 @@
0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/funds-checker.py /home/user/skynet-webportal/.env
0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/log-checker.py /home/user/skynet-webportal/.env sia 8
0 * * * * /home/user/skynet-webportal/setup-scripts/health-checker.py /home/user/skynet-webportal/.env sia 1
30 */4 * * * /home/user/skynet-webportal/setup-scripts/blocklist-airtable.py /home/user/skynet-webportal/.env
44 5 * * * /home/user/skynet-webportal/scripts/backup-aws-s3.sh 1>>/home/user/skynet-webportal/logs/backup-aws-s3.log 2>>/home/user/skynet-webportal/logs/backup-aws-s3.log
6 13 * * * /home/user/skynet-webportal/scripts/db_backup.sh 1>>/home/user/skynet-webportal/logs/db_backup.log 2>>/home/user/skynet-webportal/logs/db_backup.log
0 5 * * * /home/user/skynet-webportal/scripts/es_cleaner.py 1 http://localhost:9200
0 5 * * * /usr/bin/docker run --rm --net=host -e ROLLOVER=true jaegertracing/jaeger-es-index-cleaner:latest 1 http://localhost:9200