Merge 07f521faa3 into 391bb1268d

Dockerfile

@@ -13,8 +13,6 @@ ENV INSTANCE_NAME=searxng \
     AUTOCOMPLETE= \
     BASE_URL= \
     BIND_ADDRESS=[::]:8080 \
-    MORTY_KEY= \
-    MORTY_URL= \
     SEARXNG_SETTINGS_PATH=/etc/searxng/settings.yml \
     UWSGI_SETTINGS_PATH=/etc/searxng/uwsgi.ini \
     UWSGI_WORKERS=%k \

dockerfiles/docker-entrypoint.sh

@@ -12,8 +12,7 @@ Environment variables:
   INSTANCE_NAME settings.yml : general.instance_name
   AUTOCOMPLETE  settings.yml : search.autocomplete
   BASE_URL      settings.yml : server.base_url
-  MORTY_URL     settings.yml : result_proxy.url
-  MORTY_KEY     settings.yml : result_proxy.key
+
 Volume:
   /etc/searxng  the docker entry point copies settings.yml and uwsgi.ini in
                 this directory (see the -f command line option)"
@@ -78,20 +77,6 @@ patch_searxng_settings() {
         -e "s/autocomplete: \"\"/autocomplete: \"${AUTOCOMPLETE}\"/g" \
         -e "s/ultrasecretkey/$(openssl rand -hex 32)/g" \
         "${CONF}"
-
-    # Morty configuration
-
-    if [ -n "${MORTY_KEY}" ] && [ -n "${MORTY_URL}" ]; then
-        sed -i -e "s/image_proxy: false/image_proxy: true/g" \
-            "${CONF}"
-        cat >> "${CONF}" <<-EOF
-
-# Morty configuration
-result_proxy:
-   url: ${MORTY_URL}
-   key: !!binary "${MORTY_KEY}"
-EOF
-    fi
 }
 
 update_conf() {
@@ -166,8 +151,6 @@ if [ $DRY_RUN -eq 1 ]; then
     exit
 fi
 
-unset MORTY_KEY
-
 printf 'Listen on %s\n' "${BIND_ADDRESS}"
 
 # Start uwsgi

utils/templates/lib/systemd/system/filtron.service

@@ -1,29 +0,0 @@
-[Unit]
-
-Description=${SERVICE_NAME}
-After=syslog.target
-After=network.target
-
-[Service]
-
-Type=simple
-User=${SERVICE_USER}
-Group=${SERVICE_GROUP}
-WorkingDirectory=${SERVICE_HOME}
-ExecStart=${SERVICE_HOME}/go-apps/bin/filtron -api '${FILTRON_API}' -listen '${FILTRON_LISTEN}' -rules '${FILTRON_RULES}' -target '${FILTRON_TARGET}'
-
-Restart=always
-Environment=USER=${SERVICE_USER} HOME=${SERVICE_HOME}
-
-# Some distributions may not support these hardening directives.  If you cannot
-# start the service due to an unknown option, comment out the ones not supported
-# by your version of systemd.
-
-ProtectSystem=full
-PrivateDevices=yes
-PrivateTmp=yes
-NoNewPrivileges=true
-
-[Install]
-
-WantedBy=multi-user.target

utils/templates/lib/systemd/system/morty.service

@@ -1,29 +0,0 @@
-[Unit]
-
-Description=${SERVICE_NAME}
-After=syslog.target
-After=network.target
-
-[Service]
-
-Type=simple
-User=${SERVICE_USER}
-Group=${SERVICE_GROUP}
-WorkingDirectory=${SERVICE_HOME}
-ExecStart=${SERVICE_HOME}/go-apps/bin/morty -key '${MORTY_KEY}' -listen '${MORTY_LISTEN}' -timeout ${MORTY_TIMEOUT}
-
-Restart=always
-Environment=USER=${SERVICE_USER} HOME=${SERVICE_HOME} DEBUG=${SERVICE_ENV_DEBUG}
-
-# Some distributions may not support these hardening directives.  If you cannot
-# start the service due to an unknown option, comment out the ones not supported
-# by your version of systemd.
-
-ProtectSystem=full
-PrivateDevices=yes
-PrivateTmp=yes
-NoNewPrivileges=true
-
-[Install]
-
-WantedBy=multi-user.target