Skip to content

Commit c1918bd

Browse files
authored
Cleanup (#207)
1 parent 9aaf833 commit c1918bd

16 files changed

+56
-6230
lines changed

README.md

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,8 @@ If you know what services you need, you don't need to use the `bin.sh`, you can
5353
## Quickstart
5454

5555
**Option 1**
56-
- Start the full stack and wait until it's up and running: `streamr-docker-dev start --wait `
57-
- Browse to [http://localhost](http://localhost) to use the Core UI
58-
- Log in with your Ethereum wallet (install [MetaMask](https://metamask.io/) if you don't have one)
5956

60-
**Option 2**
61-
- Start the full stack and wait until it's up and running: `streamr-docker-dev start --except platform --wait `
62-
- Install and run the Streamr Platform independantly - [Streamr Platform Repo](https://github.com/streamr-dev/streamr-platform/blob/development/app/README.md)
63-
- Browse to [http://localhost](http://localhost) to use the Core UI
64-
- Log in with your Ethereum wallet (install [MetaMask](https://metamask.io/) if you don't have one)
65-
66-
Option 2 is for when you would like to make changes to the frontend (Platform) code.
57+
`streamr-docker-dev start --wait `
6758

6859
### Interacting with the local blockchain
6960

@@ -218,16 +209,8 @@ streamr-docker-dev start --wait
218209
- 2 broker nodes + 1 storage Streamr network nodes. This creates a local and private Streamr Network.
219210
- 3 x [Tracker](https://github.com/streamr-dev/broker)
220211
- Helps node discovery in the Strearm Network
221-
- 1 x [Core frontend](https://github.com/streamr-dev/streamr-platform/app)
212+
- 1 x [Hub frontend](https://github.com/streamr-dev/streamr-platform/app)
222213
- See more detailed build instructions in the streamr-platform repo
223-
- 1 x [Core backend](https://github.com/streamr-dev/engine-and-editor)
224-
- Centralized backend for the streamr-platform
225-
- 1 x [Data Union Server](https://github.com/streamr-dev/streamr-community-products)
226-
- The Data Union Server manages the state of the
227-
- The Data Union Server will be retired when Data Unions 2.0 is launched in Q1 of 2021
228-
- 1 x [ethereum-watcher](https://github.com/streamr-dev/streamr-ethereum-watcher)
229-
- 1 x [Chainlink node](https://github.com/streamr-dev/network-contracts)
230-
- accessible at http://localhost:6688, user:a@a.com, password:testpass
231214
- 1 x [TheGraph node](https://github.com/streamr-dev/network-contracts)
232215
- GraphQL queries at http://localhost:8000/subgraphs/name/githubname/subgraphname
233216
- GUI to past GraphQL queries: http://192.168.0.8:8000/subgraphs/name/githubname/subgraphname/graphql
@@ -250,16 +233,14 @@ streamr-docker-dev start --wait
250233
}
251234
```
252235
### Supporting services
253-
- 1 x MySQL instance with databases `core_dev` and `core_test`
254-
- 1 x Redis instance
236+
- 1 x MySQL instance
255237
- 1 x Apache Cassandra instance with `streamr_dev` keyspace
256-
- 1 x SMTP server
257238
- 1 x [Ethereum Parity node ("mainchain")](https://github.com/streamr-dev/open-ethereum-poa)
258239
- 1 x [Ethereum Parity node ("sidechain")](https://github.com/streamr-dev/open-ethereum-poa)
259240
- 1 x nginx
260-
- 1 x Postgres DB for TheGraph and Chainlink
241+
- 1 x Postgres DB for TheGraph
261242
- 1 x ipfs for TheGraph
262-
- 1 x external adapter for ENSqueries from chainlink to mainchain
243+
- 1 x adapter for ENS queries from sidechain to mainchain
263244

264245
## Troubleshooting
265246

chainlink_config/.api

Lines changed: 0 additions & 2 deletions
This file was deleted.

chainlink_config/.env_streamr_sidechain

Lines changed: 0 additions & 12 deletions
This file was deleted.

chainlink_config/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

chainlink_config/.password

Lines changed: 0 additions & 1 deletion
This file was deleted.

chainlink_config/secret

Lines changed: 0 additions & 1 deletion
This file was deleted.

chainlink_config/tempkeys/UTC--2021-06-06T15-05-54.430149681Z--7b5f1610920d5baf00d684929272213baf962efe

Lines changed: 0 additions & 1 deletion
This file was deleted.

chainlink_config/tempkeys/UTC--2021-06-06T15-05-58.631255272Z--1dcaf21e385bbfafa02b0cc936eb2df7da155e64

Lines changed: 0 additions & 1 deletion
This file was deleted.

custom-nginx-reverse-proxy.conf

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ http {
1818
tcp_nopush on;
1919
tcp_nodelay on;
2020

21-
upstream eae {
22-
server 10.200.10.1:8081;
23-
keepalive 20;
24-
keepalive_requests 50;
25-
keepalive_timeout 60s;
26-
}
27-
2821
upstream platform {
2922
server 10.200.10.1:3333;
3023
}
@@ -90,6 +83,14 @@ http {
9083
# Disables all weak ciphers
9184
ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
9285

86+
location /health_check {
87+
return 200;
88+
access_log off;
89+
add_header Content-Type text/plain;
90+
add_header Cache-Control no-cache;
91+
keepalive_timeout 0;
92+
}
93+
9394
# Websocket endpoint
9495
location /api/v2/ws {
9596
add_header X-debug "/api/v2/ws";
@@ -127,31 +128,6 @@ http {
127128
proxy_set_header Connection "";
128129
}
129130

130-
### API ENDPOINTS PROXIED TO ENGINE-AND-EDITOR ###
131-
132-
location /api {
133-
# Disable uri decoding, from https://serverfault.com/questions/459369/disabling-url-decoding-in-nginx-proxy
134-
rewrite ^ $request_uri; # get original URI
135-
rewrite ^/api(/.*) /streamr-core/api$1 break; # drop /api, put /streamr-core/api
136-
return 400; # if the second rewrite won't match
137-
138-
add_header X-debug "/api";
139-
140-
# for csv uploads
141-
client_max_body_size 512m;
142-
proxy_read_timeout 600;
143-
144-
proxy_set_header X-Forwarded-Proto $scheme;
145-
proxy_set_header X-Forwarded-Host $host;
146-
proxy_set_header X-Forwarded-Server $host;
147-
proxy_set_header X-Forwarded-Port $server_port;
148-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
149-
proxy_set_header X-Request-URI $request_uri;
150-
proxy_set_header Connection "";
151-
proxy_http_version 1.1;
152-
proxy_pass http://eae$uri;
153-
}
154-
155131
### Utility paths proxied to the Ethereum nodes in the docker stack. Useful if SSL is terminated at nginx ###
156132

157133
location /mainchain-rpc/http/ {
@@ -184,7 +160,7 @@ http {
184160
proxy_pass http://sidechain_rpc_ws/;
185161
}
186162

187-
# Proxy everything else to the Core app
163+
# Proxy everything else to the Hub app
188164
location / {
189165
add_header X-debug "/";
190166
proxy_pass http://platform;

docker-compose-ci.yml

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,6 @@ services:
2525
memory: 500M
2626
reservations:
2727
memory: 250M
28-
redis:
29-
deploy:
30-
resources:
31-
limits:
32-
cpus: '0.50'
33-
memory: 50M
34-
reservations:
35-
memory: 20M
36-
smtp:
37-
deploy:
38-
resources:
39-
limits:
40-
cpus: '0.2'
41-
memory: 30M
42-
reservations:
43-
memory: 10M
4428
nginx:
4529
deploy:
4630
resources:
@@ -97,22 +81,6 @@ services:
9781
memory: 200M
9882
reservations:
9983
memory: 150M
100-
core-api:
101-
deploy:
102-
resources:
103-
limits:
104-
cpus: '2.0'
105-
memory: 1500M
106-
reservations:
107-
memory: 500M
108-
ethereum-watcher:
109-
deploy:
110-
resources:
111-
limits:
112-
cpus: '2.00'
113-
memory: 500M
114-
reservations:
115-
memory: 100M
11684
platform:
11785
deploy:
11886
resources:
@@ -145,54 +113,6 @@ services:
145113
memory: 100M
146114
reservations:
147115
memory: 20M
148-
bridge-rabbitmq:
149-
deploy:
150-
resources:
151-
limits:
152-
cpus: '0.5'
153-
memory: 150M
154-
reservations:
155-
memory: 50M
156-
bridge-request:
157-
deploy:
158-
resources:
159-
limits:
160-
cpus: '0.5'
161-
memory: 100M
162-
reservations:
163-
memory: 10M
164-
bridge-affirmation:
165-
deploy:
166-
resources:
167-
limits:
168-
cpus: '0.5'
169-
memory: 100M
170-
reservations:
171-
memory: 10M
172-
bridge-senderhome:
173-
deploy:
174-
resources:
175-
limits:
176-
cpus: '0.5'
177-
memory: 100M
178-
reservations:
179-
memory: 10M
180-
bridge-senderforeign:
181-
deploy:
182-
resources:
183-
limits:
184-
cpus: '0.5'
185-
memory: 100M
186-
reservations:
187-
memory: 10M
188-
bridge:
189-
deploy:
190-
resources:
191-
limits:
192-
cpus: '0.1'
193-
memory: 10M
194-
reservations:
195-
memory: 10M
196116
graph-node:
197117
deploy:
198118
resources:
@@ -249,22 +169,3 @@ services:
249169
memory: 100M
250170
reservations:
251171
memory: 10M
252-
chainlink:
253-
deploy:
254-
restart_policy:
255-
condition: on-failure
256-
max_attempts: 5
257-
resources:
258-
limits:
259-
cpus: '1.0'
260-
memory: 1G
261-
reservations:
262-
memory: 50M
263-
chainlink-external-adapter:
264-
deploy:
265-
resources:
266-
limits:
267-
cpus: '1.0'
268-
memory: 1G
269-
reservations:
270-
memory: 50M

0 commit comments

Comments
 (0)