Skip to content

Commit e8ef259

Browse files
authoredAug 11, 2022
feat: clean up readme and code of conduct (#382)
1 parent 7a14d6a commit e8ef259

File tree

2 files changed

+16
-59
lines changed

2 files changed

+16
-59
lines changed
 

‎CODE_OF_CONDUCT.md

+2-45
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,3 @@
1-
# Contributor Covenant Code of Conduct
1+
# Code of conduct
22

3-
## Our Pledge
4-
5-
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6-
7-
## Our Standards
8-
9-
Examples of behavior that contributes to creating a positive environment include:
10-
11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
16-
17-
Examples of unacceptable behavior by participants include:
18-
19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21-
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
* Other conduct which could reasonably be considered inappropriate in a professional setting
24-
25-
## Our Responsibilities
26-
27-
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28-
29-
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30-
31-
## Scope
32-
33-
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34-
35-
## Enforcement
36-
37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@urbica.co. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38-
39-
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40-
41-
## Attribution
42-
43-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44-
45-
[homepage]: http://contributor-covenant.org
46-
[version]: http://contributor-covenant.org/version/1/4/
3+
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/maplibre/maplibre/blob/main/CODE_OF_CONDUCT.md)

‎README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Martin requires PostGIS >= 2.4.0.
5050
You can download martin from [Github releases page](https://github.com/maplibre/martin/releases).
5151

5252
| Platform | Downloads (latest) |
53-
| -------- | ----------------------- |
53+
|----------|-------------------------|
5454
| Linux | [64-bit][rl-linux-tar] |
5555
| macOS | [64-bit][rl-macos-tar] |
5656
| Windows | [64-bit][rl-winx64-zip] |
@@ -87,7 +87,7 @@ Martin provides [TileJSON](https://github.com/mapbox/tilejson-spec) endpoint for
8787
When started, martin will go through all spatial tables and functions with an appropriate signature in the database. These tables and functions will be available as the HTTP endpoints, which you can use to query Mapbox vector tiles.
8888

8989
| Method | URL | Description |
90-
| ------ | -------------------------------------------------------------------------------- | ------------------------------------------------------- |
90+
|--------|----------------------------------------------------------------------------------|---------------------------------------------------------|
9191
| `GET` | `/index.json` | [Table Sources List](#table-sources-list) |
9292
| `GET` | `/{schema_name}.{table_name}.json` | [Table Source TileJSON](#table-source-tilejson) |
9393
| `GET` | `/{schema_name}.{table_name}/{z}/{x}/{y}.pbf` | [Table Source Tiles](#table-source-tiles) |
@@ -409,12 +409,12 @@ Options:
409409

410410
You can also configure martin using environment variables
411411

412-
| Environment variable | Example | Description |
413-
| ----------------------------- | ---------------------------------- | --------------------------------------------- |
414-
| `DATABASE_URL` | `postgres://postgres@localhost/db` | Postgres database connection |
415-
| `CA_ROOT_FILE` | `./ca-certificate.crt` | Loads trusted root certificates from a file |
416-
| `DEFAULT_SRID` | `4326` | Fallback SRID |
417-
| `DANGER_ACCEPT_INVALID_CERTS` | `false` | Trust invalid certificates |
412+
| Environment variable | Example | Description |
413+
|-------------------------------|------------------------------------|---------------------------------------------|
414+
| `DATABASE_URL` | `postgres://postgres@localhost/db` | Postgres database connection |
415+
| `CA_ROOT_FILE` | `./ca-certificate.crt` | Loads trusted root certificates from a file |
416+
| `DEFAULT_SRID` | `4326` | Fallback SRID |
417+
| `DANGER_ACCEPT_INVALID_CERTS` | `false` | Trust invalid certificates |
418418

419419
## Configuration File
420420

@@ -575,7 +575,7 @@ services:
575575
image: urbica/martin
576576
restart: unless-stopped
577577
ports:
578-
- 3000:3000
578+
- "3000:3000"
579579
environment:
580580
- DATABASE_URL=postgres://postgres:password@db/db
581581
depends_on:
@@ -618,7 +618,7 @@ services:
618618
image: nginx:alpine
619619
restart: unless-stopped
620620
ports:
621-
- 80:80
621+
- "80:80"
622622
volumes:
623623
- ./cache:/var/cache/nginx
624624
- ./nginx.conf:/etc/nginx/nginx.conf:ro
@@ -782,26 +782,26 @@ You can use martin with [Managed PostgreSQL from DigitalOcean](https://www.digit
782782

783783
First, you need to download the CA certificate and get your cluster connection string from the [dashboard](https://cloud.digitalocean.com/databases). After that, you can use the connection string and the CA certificate to connect to the database
784784

785-
```
785+
```shell
786786
martin --ca-root-file ./ca-certificate.crt postgres://user:password@host:port/db?sslmode=require
787787
```
788788

789789
### Using with Heroku PostgreSQL
790790

791791
You can use martin with [Managed PostgreSQL from Heroku](https://www.heroku.com/postgres) with PostGIS extension
792792

793-
```
793+
```shell
794794
heroku pg:psql -a APP_NAME -c 'create extension postgis'
795795
```
796796

797797
In order to trust the Heroku certificate, you can disable certificate validation with either `DANGER_ACCEPT_INVALID_CERTS` environment variable
798798

799-
```
799+
```shell
800800
DATABASE_URL=$(heroku config:get DATABASE_URL -a APP_NAME) DANGER_ACCEPT_INVALID_CERTS=true martin
801801
```
802802

803803
or `--danger-accept-invalid-certs` command-line argument
804804

805-
```
805+
```shell
806806
martin --danger-accept-invalid-certs $(heroku config:get DATABASE_URL -a APP_NAME)
807807
```

0 commit comments

Comments
 (0)
Please sign in to comment.