Skip to content

Commit

Permalink
Merge branch 'v2'
Browse files Browse the repository at this point in the history
  • Loading branch information
ksamuel committed Aug 19, 2020
2 parents 183150a + aa064a5 commit 9558751
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
6 changes: 6 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[build-system]
requires = [
"setuptools >= 40.9.0",
"wheel",
]
build-backend = "setuptools.build_meta"
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ install_requires =
* = static/img/*, static/css/*, static/js/*, view/*
hello = *.msg

[options.entry_points]
console_scripts =
zerobin = zerobin.cli:main
8 changes: 0 additions & 8 deletions setup.py

This file was deleted.

6 changes: 3 additions & 3 deletions zerobin/default_settings.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Get error messages and auto reload.
# Don't set this to True in production
DEBUG = True
DEBUG = False

# Port and host for the embedded python server
HOST = "127.0.0.1"
Expand All @@ -9,18 +9,18 @@
# Names/links to insert in the footer.
#
MENU = (
("Create paste", "/"),
("Github", "https://github.com/Tygs/0bin"),
("Faq", "/faq/"), # You probably want to keep this
# Any link with "mailto:" will be escaped to limit spam, but displayed
# correctly to the user using JS.
("Contact", "mailto:[email protected]"),
("Zerobin Pastebin", "https://www.0bin.net/"), # Thanks the authors :)
("How to buy Bitcoin?", "/buy_bitcoin"), # Thanks the authors :)
)

# Size limit of the paste content in bytes. Be careful, allowing a size too big can
# slow down the user's browser
MAX_SIZE = 1024 * 600
MAX_SIZE = 1024 * 1000

# Display a tiny counter for pastes created.
DISPLAY_COUNTER = True
Expand Down

0 comments on commit 9558751

Please sign in to comment.