Skip to content

Commit

Permalink
remove config files accidentally pushed
Browse files Browse the repository at this point in the history
  • Loading branch information
Anne Maier committed Aug 28, 2024
1 parent 1b105fe commit bab9189
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 16 deletions.
Binary file removed .coverage.8674b3a12c0a.9.XzQXStzx
Binary file not shown.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DEV_CREATE_OEREBLEX_TABLES_SCRIPT = $(VENV_BIN)/create_oereblex_tables

MODEL_PK_TYPE_IS_STRING ?= true

PRINT_URL ?= http://svamaa-print-1:8080/print/oereb
PRINT_URL ?= http://oereb-print:8080/print/oereb

# ********************
# Variable definitions
Expand Down
4 changes: 2 additions & 2 deletions dev/config/create_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
def _create_yaml_config_(
name='pyramid_oereb.yml',
database='postgresql://postgres:password@localhost/pyramid_oereb',
print_url='http://svamaa-print-1:8080/print/oereb'):
print_url='http://oereb-print:8080/print/oereb'):
"""
Creates the specified YAML file using a template. This YAML file contains the standard
configuration to run a oereb server out of the box.
Expand Down Expand Up @@ -61,7 +61,7 @@ def create_yaml():
dest='print_url',
metavar='PRINT_URL',
type='string',
default='http://svamaa-print-1:8080/print/oereb',
default='http://oereb-print:8080/print/oereb',
help='The URL of the print server'
)
options, args = parser.parse_args()
Expand Down
10 changes: 0 additions & 10 deletions development.ini.mako
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@ pyramid.default_locale_name = en
pyramid_oereb.cfg.file = %(here)s/pyramid_oereb.yml
pyramid_oereb.cfg.section = pyramid_oereb

# Enable debug toolbar
pyramid.includes = pyramid_debugtoolbar
debugtoolbar.hosts = 0.0.0.0/0
debugtoolbar.enabled = true
debugtoolbar.intercept_exc = display
debugtoolbar.max_request_history = 100
debugtoolbar.panels = headers logging performance renderings
request_vars sqlalchemy traceback


sqlalchemy.url = sqlite:///%(here)s/pyramid_oereb.sqlite

###
Expand Down
6 changes: 3 additions & 3 deletions pyramid_oereb/core/views/webservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,13 +625,13 @@ def __response_compression__(self, response):
pyramid.response.Response: The response.
"""

if 'ACCEPT_ENCODING' in self._request.headers:
if 'br' in self._request.headers['ACCEPT_ENCODING']:
if 'Accept-Encoding' in self._request.headers:
if 'br' in self._request.headers['Accept-Encoding']:
response.content_encoding = 'br'
compressed_response = brotli.compress(response.body)
response.content_length = str(len(compressed_response))
response.body = compressed_response
elif 'gzip' in self._request.headers['ACCEPT_ENCODING']:
elif 'gzip' in self._request.headers['Accept-Encoding']:
response.content_encoding = 'gzip'
gzip_buffer = io.BytesIO()
with gzip.GzipFile(mode='wb', fileobj=gzip_buffer) as gzip_file:
Expand Down

0 comments on commit bab9189

Please sign in to comment.