Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
e8bd1134
Commit
e8bd1134
authored
Jul 15, 2014
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abilian: patch extranet repo
parent
a13690c7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
4 deletions
+45
-4
software/abilian/extranet_spr/extranet.patch
software/abilian/extranet_spr/extranet.patch
+42
-0
software/abilian/extranet_spr/software.cfg
software/abilian/extranet_spr/software.cfg
+3
-4
No files found.
software/abilian/extranet_spr/extranet.patch
0 → 100644
View file @
e8bd1134
diff --git a/etc/deps.txt b/etc/deps.txt
index b8fb0ec..c136c2f 100644
--- a/etc/deps.txt
+++ b/etc/deps.txt
@@ -26,7 +26,7 @@
requests >= 2.3, < 2.4
iso8601==0.1.4
passlib==1.6.1
py-bcrypt==0.3
-Pillow>=2.0.0
+Pillow>=2.4.0
python-magic==0.4.6
twill>=1.8.0
validate_email==1.2
diff --git a/extranet_spr/application.py b/extranet_spr/application.py
index 9d8e84c..72a83ee 100644
--- a/extranet_spr/application.py
+++ b/extranet_spr/application.py
@@ -80,7 +80,7 @@
def create_app(config=None, config_file=None):
assert not config
config = Config(config_file)
- app = Application(config=config)
+ app = Application(config=config, instance_path=os.environ.get('EXTRANET_INSTANCE_PATH'))
return app
# loader to be used by celery workers
diff --git a/extranet_spr/commands/manage.py b/extranet_spr/commands/manage.py
index b144c66..1f14ab2 100755
--- a/extranet_spr/commands/manage.py
+++ b/extranet_spr/commands/manage.py
@@ -78,8 +78,9 @@
def run():
DEBUG = app.config.get('DEBUG')
PORT = app.config.get('PORT', 5000)
+ HOST = app.config.get('INSTANCE_HOST', '0.0.0.0')
- app.run(host="0.0.0.0", debug=DEBUG, port=PORT)
+ app.run(host=HOST, debug=DEBUG, port=PORT)
@manager.command
software/abilian/extranet_spr/software.cfg
View file @
e8bd1134
...
...
@@ -126,7 +126,7 @@ egg-link = Extranet-SPR.egg-link
[extranet-patch]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/${:filename}
md5sum =
9613fc984e6d3e1c5812ffd018ff6a95
md5sum =
2e051c06e8107e613f642c833f435ff3
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = extranet.patch
...
...
@@ -366,7 +366,6 @@ iso8601 = 0.1.4
passlib = 1.6.1
py-bcrypt = 0.3
python-magic = 0.4.6
twill = 0.9.1
validate_email = 1.2
pydns = 2.3.6
docflow = 0.3.1
...
...
@@ -380,7 +379,7 @@ WTForms = 1.0.4
WTForms-Alchemy = 0.7.15
WTForms-Components = 0.7.0
#
psycopg2 = 2.4.6
psycopg2 = 2.4.6
SQLAlchemy = 0.8.6
# actually >=0.8,<0.9 but only buildout 2 can do that
redis = 2.7.2
...
...
@@ -408,7 +407,7 @@ coveralls = 0.2
Fabric = 1.6.0
fabtools = 0.13.0
pytest-cov = 1.6
pytest = 2.
4.2
pytest = 2.
3.4
Flask-LinkTester = 0.2.5
#: PRODUCTION
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment