Skip to content

Commit 386bdde

Browse files
committed
Merge branch 'master' of github.com:melezhik/sparky
2 parents 64eda12 + 33fc285 commit 386bdde

File tree

5 files changed

+24
-23
lines changed

5 files changed

+24
-23
lines changed

Changes

+3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ Revision history for Sparky
22

33
{{$NEXT}}
44

5+
0.2.3 2024-04-26T16:30:00Z
6+
57
- Change authentication protocol
68
to oauth 2.0
9+
- Bump Sparrow6 version
710

811
0.2.2 2024-03-21T14:30:00Z
912

META6.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"DBIish::Pool",
1111
"JSON::Fast",
1212
"HTTP::Tiny",
13-
"Sparrow6:ver<0.0.45+>",
13+
"Sparrow6:ver<0.0.47+>",
1414
"Sparrowdo:ver<0.1.27+>",
1515
"Time::Crontab",
1616
"File::Directory::Tree",
@@ -42,5 +42,5 @@
4242
},
4343
"tags" : [ ],
4444
"test-depends" : [ ],
45-
"version" : "0.2.2"
45+
"version" : "0.2.3"
4646
}

README.md

+12-11
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,17 @@ $ nano utils/install-sparky-web-systemd.raku # change working directory, user an
109109
$ sparrowdo --sparrowfile=utils/install-sparky-web-systemd.raku --no_sudo --localhost
110110
```
111111

112+
## Setting web app tcp parameters
113+
114+
By default web app listens on host `0.0.0.0`, port `4000`, to configure web app tcp host and port set `SPARKY_HOST` and `SPARKY_TCP_PORT` variables in `~/sparky.yaml`
115+
116+
```yaml
117+
SPARKY_HOST: 127.0.0.1
118+
SPARKY_TCP_PORT: 5000
119+
```
120+
121+
# Security
122+
112123
## OAUTH 2.0 authentication
113124
114125
Sparky web server _comes with_ [oauth](https://oauth.net/2/) authentication of out of the box
@@ -131,18 +142,8 @@ auth:
131142

132143
## ACL
133144

134-
Sparky ACL allows to create access control lists to manage role based access to Sparky resources,
135-
see https://github.com/melezhik/sparky/blob/master/docs/acl.md
136-
137-
## Setting web app tcp parameters
138-
139-
By default web app listens on host `0.0.0.0`, port `4000`, to configure web app tcp host and port
140-
set `SPARKY_HOST` and `SPARKY_TCP_PORT` variables in `~/sparky.yaml`
145+
Sparky ACL allows to create access control lists to manage role based access to Sparky resources, see (docs/acl.md)[https://github.com/melezhik/sparky/blob/master/docs/acl.md]
141146

142-
```yaml
143-
SPARKY_HOST: 127.0.0.1
144-
SPARKY_TCP_PORT: 5000
145-
```
146147

147148
# Creating first sparky project
148149

docs/acl.md

+6-9
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ projects:
1919
users:
2020
- "*"
2121
service-logs:
22-
allow:
23-
users:
24-
- "*"
22+
allow:
23+
users:
24+
- "*"
2525
```
2626
2727
In this example we allow users alexey.melezhik and john.brown to run run any jobs,
@@ -62,7 +62,7 @@ acl/hosts/host-bar/list.yaml
6262
acl/hosts/host-baz/list.yaml
6363
```
6464

65-
Host specific ACL override default ACL and has the same DSL to describe access rules.
65+
Host specific ACL overrides default ACL and has the same semantic.
6666

6767
# Explicit deny
6868

@@ -79,11 +79,8 @@ projects:
7979
- bad_guy
8080
```
8181

82-
This code code allows all users to execute hello-world sparky project, besides a user with login bad_guy
82+
This code allows all users to execute hello-world sparky project, besides a user with a login bad_guy
8383

8484
## Access to everyone
8585

86-
To allow any user to run run any resources just remove any list.yaml files from Sparky configuration
87-
88-
89-
86+
To allow any user to run any resources just remove any list.yaml files from Sparky configuration

lib/Sparky.rakumod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use v6;
22

3-
unit module Sparky:ver<0.2.2>;
3+
unit module Sparky:ver<0.2.3>;
44
use YAMLish;
55
use DBIish;
66
use Time::Crontab;

0 commit comments

Comments
 (0)