Skip to content

Commit 9f05de0

Browse files
michielbdejongmichielbdejong
authored
Merge branch 'main' into fix/issue#86
2 parents 6c06686 + 47c6ac6 commit 9f05de0

6 files changed

Lines changed: 1302 additions & 178 deletions

File tree

‎README.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ root:~/pivot# npx community-solid-server -c ./config/prod.json ./custom-config.j
6868
2024-11-13T11:28:12.002Z [ServerInitializer] {Primary} info: Listening to server at https://localhost/
6969
```
7070

71-
Or on localhost:
71+
Or on `https localhost`:
7272

7373
```bash
7474
git clone https://github.com/solid-contrib/pivot
@@ -80,6 +80,21 @@ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 3
8080
npm start
8181
```
8282

83+
Or on `http localhost`, use `config/dev-http-suffix.json`
84+
```
85+
npx community-solid-server -c ./config/dev-http-suffix.json ./custom-config.json -f ./data -p 3000 -b http://localhost:3000 -m .
86+
```
87+
or `config/dev-http-subdomain.json`
88+
When using localhost with subdomain you must also declaree the subdomain in `/etc/hosts`.
89+
To create an account `bob.localhost:3000` you shall add the following record
90+
```
91+
127.0.0.1 bob.localhost
92+
```
93+
```
94+
npx community-solid-server -c ./config/dev-http-subdomain.json ./custom-config.json -f ./data -p 3000 -b http://localhost:3000 -m .
95+
```
96+
97+
8398
## Why 'pivot'?
8499

85100
_Short answer:_ we needed a name. ;)

‎config/customise-me.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"overrideParameters": {
3030
"@type": "StaticFolderGenerator",
31-
"templateFolder": "node_modules/css-mashlib/templates/pod"
31+
"templateFolder": "templates/pod"
3232
}
3333
},
3434
{

‎config/dev-http-subdomain.json‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"comment": "Copied from https://github.com/SolidOS/css-mashlib/blob/ae21af4685f6c95c1f091cacd952831f272ea119/config/https-mashlib-subdomain-file.json, (1) pivot:config/http/handler/default.json, (2) pivot:config/storage/middleware/default.json, (3) pivot:config/pivot-overrides.json added as the last import",
3+
"@context": [
4+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
5+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/pivot/^1.0.0/components/context.jsonld"
6+
],
7+
"import": [
8+
"css:config/app/init/default.json",
9+
"css:config/app/main/default.json",
10+
"css:config/app/variables/default.json",
11+
"pivot:config/http/handler/default.json",
12+
"css:config/http/middleware/default.json",
13+
"css:config/http/notifications/all.json",
14+
"css:config/http/server-factory/http.json",
15+
"css:config/http/static/default.json",
16+
"css:config/identity/access/public.json",
17+
"css:config/identity/email/default.json",
18+
"css:config/identity/handler/default.json",
19+
"pivot:config/identity/oidc/default.json",
20+
"css:config/identity/ownership/token.json",
21+
"css:config/identity/pod/static.json",
22+
"css:config/ldp/authentication/dpop-bearer.json",
23+
"css:config/ldp/authorization/webacl.json",
24+
"css:config/ldp/handler/default.json",
25+
"css:config/ldp/metadata-parser/default.json",
26+
"css:config/ldp/metadata-writer/default.json",
27+
"css:config/ldp/modes/default.json",
28+
"css:config/storage/backend/pod-quota-file.json",
29+
"css:config/storage/key-value/resource-store.json",
30+
"css:config/storage/location/pod.json",
31+
"pivot:config/storage/middleware/default.json",
32+
"css:config/util/auxiliary/acl.json",
33+
"css:config/util/identifiers/subdomain.json",
34+
35+
"css:config/util/logging/winston.json",
36+
"css:config/util/representation-conversion/default.json",
37+
"css:config/util/resource-locker/file.json",
38+
"css:config/util/variables/default.json",
39+
"pivot:config/pivot-overrides.json"
40+
],
41+
"@graph": [
42+
{
43+
"comment": [
44+
"A filesystem-based server with Databrowser as UI.",
45+
"Derived from config/file-no-setup.json"
46+
]
47+
}
48+
]
49+
}

‎config/dev-http-suffix.json‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"comment": "Copied from https://github.com/SolidOS/css-mashlib/blob/ae21af4685f6c95c1f091cacd952831f272ea119/config/https-mashlib-subdomain-file.json, (1) pivot:config/http/handler/default.json, (2) pivot:config/storage/middleware/default.json, (3) pivot:config/pivot-overrides.json added as the last import",
3+
"@context": [
4+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
5+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/pivot/^1.0.0/components/context.jsonld"
6+
],
7+
"import": [
8+
"css:config/app/init/default.json",
9+
"css:config/app/main/default.json",
10+
"css:config/app/variables/default.json",
11+
"pivot:config/http/handler/default.json",
12+
"css:config/http/middleware/default.json",
13+
"css:config/http/notifications/all.json",
14+
"css:config/http/server-factory/http.json",
15+
"css:config/http/static/default.json",
16+
"css:config/identity/access/public.json",
17+
"css:config/identity/email/default.json",
18+
"css:config/identity/handler/default.json",
19+
"pivot:config/identity/oidc/default.json",
20+
"css:config/identity/ownership/token.json",
21+
"css:config/identity/pod/static.json",
22+
"css:config/ldp/authentication/dpop-bearer.json",
23+
"css:config/ldp/authorization/webacl.json",
24+
"css:config/ldp/handler/default.json",
25+
"css:config/ldp/metadata-parser/default.json",
26+
"css:config/ldp/metadata-writer/default.json",
27+
"css:config/ldp/modes/default.json",
28+
"css:config/storage/backend/pod-quota-file.json",
29+
"css:config/storage/key-value/resource-store.json",
30+
"css:config/storage/location/pod.json",
31+
"pivot:config/storage/middleware/default.json",
32+
"css:config/util/auxiliary/acl.json",
33+
"css:config/util/identifiers/suffix.json",
34+
35+
"css:config/util/logging/winston.json",
36+
"css:config/util/representation-conversion/default.json",
37+
"css:config/util/resource-locker/file.json",
38+
"css:config/util/variables/default.json",
39+
"pivot:config/pivot-overrides.json"
40+
],
41+
"@graph": [
42+
{
43+
"comment": [
44+
"A filesystem-based server with Databrowser as UI.",
45+
"Derived from config/file-no-setup.json"
46+
]
47+
}
48+
]
49+
}

0 commit comments

Comments
 (0)