diff --git a/README.md b/README.md index 6615666..b04993e 100644 --- a/README.md +++ b/README.md @@ -241,6 +241,8 @@ Description=Whoogle #Environment=WHOOGLE_ALT_SO=farside.link/anonymousoverflow # Load values from dotenv only #Environment=WHOOGLE_DOTENV=1 +# specify dotenv location if not in default location +#Environment=WHOOGLE_DOTENV_PATH=/whoogle.env Type=simple User= # If installed as a package, add: @@ -411,6 +413,7 @@ There are a few optional environment variables available for customizing a Whoog | -------------------- | ----------------------------------------------------------------------------------------- | | WHOOGLE_URL_PREFIX | The URL prefix to use for the whoogle instance (i.e. "/whoogle") | | WHOOGLE_DOTENV | Load environment variables in `whoogle.env` | +| WHOOGLE_DOTENV_PATH | The path to `whoogle.env` if not in default location | | WHOOGLE_USER | The username for basic auth. WHOOGLE_PASS must also be set if used. | | WHOOGLE_PASS | The password for basic auth. WHOOGLE_USER must also be set if used. | | WHOOGLE_PROXY_USER | The username of the proxy server. | diff --git a/app/__init__.py b/app/__init__.py index 2e661dd..99516ed 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -25,9 +25,10 @@ app = Flask(__name__, static_folder=os.path.dirname( app.wsgi_app = ProxyFix(app.wsgi_app) -dot_env_path = ( - os.path.join(os.path.dirname(os.path.abspath(__file__)), - '../whoogle.env')) +# look for WHOOGLE_ENV, else look in parent directory +dot_env_path = os.getenv( + "WHOOGLE_DOTENV_PATH", + os.path.join(os.path.dirname(os.path.abspath(__file__)), "../whoogle.env")) # Load .env file if enabled if os.path.exists(dot_env_path):