Skip to content

Commit

Permalink
Merge branch 'release/v0.9.0a'
Browse files Browse the repository at this point in the history
  • Loading branch information
Piuliss committed Jan 28, 2018
2 parents bd52a76 + 5db5fef commit 053f60e
Show file tree
Hide file tree
Showing 389 changed files with 4,260 additions and 1,155 deletions.
5 changes: 5 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[run]
include = manati/*
omit = *migrations*, *tests*
plugins =
django_coverage_plugin
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.*
!.coveragerc
!.env
!.pylintrc
33 changes: 33 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# http://editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{py,rst,ini}]
indent_style = space
indent_size = 4

[*.py]
line_length=120
known_first_party=manati
multi_line_output=3
default_section=THIRDPARTY

[*.{html,css,scss,json,yml}]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false

[Makefile]
indent_style = tab

[nginx.conf]
indent_style = space
indent_size = 2
6 changes: 6 additions & 0 deletions .env-docker.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
DOCKER_COMPOSE=True
POSTGRES_PASSWORD=password
POSTGRES_USER=manati_db_user
POSTGRES_DB=manati_db
REDISTOGO_URL_DOCKER=redis://redis/0
DB_SERVICE=postgres
38 changes: 38 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# PostgreSQL
POSTGRES_PASSWORD=password
POSTGRES_USER=manati_db_user
POSTGRES_DB=manati_db
POSTGRES_HOST=localhost
POSTGRES_PORT=5432
DATABASE_URL=postgres://manati_db_user:password@localhost:5432/manati_db
CONN_MAX_AGE=

# Domain name, used by caddy
DOMAIN_NAME=manatiproject.com

# General settings
# DJANGO_READ_DOT_ENV_FILE=True
DJANGO_ADMIN_URL=
DJANGO_SETTINGS_MODULE=config.settings.local
DJANGO_SECRET_KEY=ZkZas*1kYc0@xyGC4oh8_+/%EEyUVkrpR2=dq1eyh62zgledwH
DJANGO_ALLOWED_HOSTS=.manatiproject.com


# AWS Settings
DJANGO_AWS_ACCESS_KEY_ID=
DJANGO_AWS_SECRET_ACCESS_KEY=
DJANGO_AWS_STORAGE_BUCKET_NAME=

# Used with email
DJANGO_MAILGUN_API_KEY=
DJANGO_SERVER_EMAIL=
MAILGUN_SENDER_DOMAIN=

# Security! Better to use DNS for this task, but you can use redirect
DJANGO_SECURE_SSL_REDIRECT=False

# django-allauth
DJANGO_ACCOUNT_ALLOW_REGISTRATION=True

# Redis Settings
REDIS_PASSWORD=
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto

0 comments on commit 053f60e

Please sign in to comment.