From 3b6f4d0df3c17c05505e6b06c4e6972859d3d878 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Wed, 21 Feb 2018 19:50:14 +0530 Subject: [PATCH] searx: Update Apache configuration and icon Signed-off-by: Joseph Nuthalapati Reviewed-by: Sunil Mohan Adapa --- actions/searx | 8 ++++---- .../conf-available/searx-freedombox.conf | 9 ++++----- static/themes/default/icons/searx.png | Bin 8390 -> 2039 bytes 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/actions/searx b/actions/searx index 4ef0a1c69..10f70cb53 100755 --- a/actions/searx +++ b/actions/searx @@ -53,7 +53,7 @@ def _copy_uwsgi_configuration(): 'uwsgi/apps-available/searx.ini') destination = '/etc/uwsgi/apps-available/' - if not os.path.exists(destination): + if not os.path.exists(os.path.join(destination, 'searx.ini')): shutil.copy(example_config, destination) action_utils.webserver_enable('uwsgi', kind='module') @@ -83,9 +83,9 @@ def subcommand_setup(_): def subcommand_enable(_): """Enable web configuration and reload.""" - # TODO Write action_utils functions for enable/disable uwsgi - os.symlink('/etc/uwsgi/apps-available/searx.ini', - '/etc/uwsgi/apps-enabled/') + if not os.path.exists('/etc/uwsgi/apps-enabled/searx.ini'): + os.symlink('/etc/uwsgi/apps-available/searx.ini', + '/etc/uwsgi/apps-enabled/searx.ini') action_utils.webserver_enable('searx-freedombox') diff --git a/data/etc/apache2/conf-available/searx-freedombox.conf b/data/etc/apache2/conf-available/searx-freedombox.conf index 69d92392f..2435d475a 100644 --- a/data/etc/apache2/conf-available/searx-freedombox.conf +++ b/data/etc/apache2/conf-available/searx-freedombox.conf @@ -1,5 +1,4 @@ - - Options FollowSymLinks Indexes - SetHandler uwsgi-handler - uWSGISocket /run/uwsgi/app/searx/socket - \ No newline at end of file + + ProxyPass unix:/run/uwsgi/app/searx/socket|uwsgi://uwsgi-uds-searx/ + + diff --git a/static/themes/default/icons/searx.png b/static/themes/default/icons/searx.png index 2db08171010c34e83b3e32897534d4b244109c96..3818d3d60bb54b43e47242a88d7a2a56ea27c6bd 100644 GIT binary patch literal 2039 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 wQcW}!=