Unverified Commit 0a6575d2 authored by Ben Busby's avatar Ben Busby
Browse files

Hotfix: Move language/country json to app dir

Pip installs of whoogle search were missing access to the misc/ folder,
which previously contained the language and country json files. These
have been moved to app/misc, and the previous root level misc/ was
renamed to config/ (since it now only contains the tor config files).

Bump to 0.3.1.
parent 329c38ef
......@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
libffi-dev \
tor
COPY misc/tor/torrc /etc/tor/torrc
COPY config/tor/torrc /etc/tor/torrc
COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
......@@ -50,4 +50,4 @@ COPY . .
EXPOSE $EXPOSE_PORT
CMD misc/tor/start-tor.sh & ./run
CMD config/tor/start-tor.sh & ./run
graft app/static
graft app/templates
graft app/misc
include requirements.txt
global-exclude *.pyc
......@@ -14,14 +14,14 @@ app.default_key_set = generate_user_keys()
app.no_cookie_ips = []
app.config['SECRET_KEY'] = os.urandom(32)
app.config['SESSION_TYPE'] = 'filesystem'
app.config['VERSION_NUMBER'] = '0.3.0'
app.config['VERSION_NUMBER'] = '0.3.1'
app.config['APP_ROOT'] = os.getenv(
'APP_ROOT',
os.path.dirname(os.path.abspath(__file__)))
app.config['LANGUAGES'] = json.load(open(
os.path.join(app.config['APP_ROOT'], '../misc/languages.json')))
os.path.join(app.config['APP_ROOT'], 'misc/languages.json')))
app.config['COUNTRIES'] = json.load(open(
os.path.join(app.config['APP_ROOT'], '../misc/countries.json')))
os.path.join(app.config['APP_ROOT'], 'misc/countries.json')))
app.config['STATIC_FOLDER'] = os.getenv(
'STATIC_FOLDER',
os.path.join(app.config['APP_ROOT'], 'static'))
......
......@@ -8,10 +8,10 @@ setuptools.setup(
author='Ben Busby',
author_email='benbusby@protonmail.com',
name='whoogle-search',
version='0.3.0',
version='0.3.1',
include_package_data=True,
install_requires=requirements,
description='Self-hosted, ad-free, privacy-respecting Google metasearch engine',
description='Self-hosted, ad-free, privacy-respecting metasearch engine',
long_description=long_description,
long_description_content_type='text/markdown',
url='https://github.com/benbusby/whoogle-search',
......
../app/misc/
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment