diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/lxc-searx.env | 1 | ||||
| -rwxr-xr-x | utils/lxc.sh | 5 | ||||
| -rwxr-xr-x | utils/searx.sh | 4 | ||||
| -rw-r--r-- | utils/templates/etc/nginx/default.apps-available/morty.conf | 2 | ||||
| -rw-r--r-- | utils/templates/etc/nginx/default.apps-available/searx.conf:filtron | 6 |
5 files changed, 8 insertions, 10 deletions
diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env index 3121b63ce..4b346cb9e 100644 --- a/utils/lxc-searx.env +++ b/utils/lxc-searx.env @@ -21,7 +21,6 @@ lxc_set_suite_env() { # to disable containers, comment out lines .. # end of standard support see https://wiki.ubuntu.com/Releases - "$LINUXCONTAINERS_ORG_NAME:ubuntu/16.04" "ubu1604" # April 2021 "$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04" "ubu1804" # April 2023 "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # April 2025 "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.10" "ubu2010" # July 2021 diff --git a/utils/lxc.sh b/utils/lxc.sh index bad5c10c8..30936e9b1 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -24,13 +24,12 @@ LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}" LXC_SHARE_FOLDER="/share" LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")" -ubu1604_boilerplate=" +ubu1804_boilerplate=" export DEBIAN_FRONTEND=noninteractive apt-get update -y apt-get upgrade -y apt-get install -y git curl wget " -ubu1804_boilerplate="$ubu1604_boilerplate" ubu1904_boilerplate="$ubu1804_boilerplate" # shellcheck disable=SC2034 @@ -59,7 +58,7 @@ echo 'Set disable_coredump false' >> /etc/sudo.conf # shellcheck disable=SC2034 centos7_boilerplate=" yum update -y -yum install -y git curl wget hostname sudo +yum install -y git curl wget hostname sudo which echo 'Set disable_coredump false' >> /etc/sudo.conf " diff --git a/utils/searx.sh b/utils/searx.sh index cedefa7f1..ed015bdd2 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -394,8 +394,8 @@ clone_searx() { info_msg "create local branch ${GIT_BRANCH} from start point: origin/${GIT_BRANCH}" git branch "${GIT_BRANCH}" "origin/${GIT_BRANCH}" fi - if [[ ! $(git branch --show-current) == "${GIT_BRANCH}" ]]; then - warn_msg "take into account, installing branch $GIT_BRANCH while current branch is $(git branch --show-current)" + if [[ ! $(git rev-parse --abbrev-ref HEAD) == "${GIT_BRANCH}" ]]; then + warn_msg "take into account, installing branch $GIT_BRANCH while current branch is $(git rev-parse --abbrev-ref HEAD)" fi export SERVICE_HOME git_clone "$REPO_ROOT" "$SEARX_SRC" \ diff --git a/utils/templates/etc/nginx/default.apps-available/morty.conf b/utils/templates/etc/nginx/default.apps-available/morty.conf index e7ffa27e2..51f083985 100644 --- a/utils/templates/etc/nginx/default.apps-available/morty.conf +++ b/utils/templates/etc/nginx/default.apps-available/morty.conf @@ -3,7 +3,7 @@ location /morty { proxy_pass http://127.0.0.1:3000/; - proxy_set_header Host \$http_host; + proxy_set_header Host \$host; proxy_set_header Connection \$http_connection; proxy_set_header X-Real-IP \$remote_addr; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; diff --git a/utils/templates/etc/nginx/default.apps-available/searx.conf:filtron b/utils/templates/etc/nginx/default.apps-available/searx.conf:filtron index d3137e42d..a89aa38b3 100644 --- a/utils/templates/etc/nginx/default.apps-available/searx.conf:filtron +++ b/utils/templates/etc/nginx/default.apps-available/searx.conf:filtron @@ -3,7 +3,7 @@ location ${SEARX_URL_PATH} { proxy_pass http://127.0.0.1:4004/; - proxy_set_header Host \$http_host; + proxy_set_header Host \$host; proxy_set_header Connection \$http_connection; proxy_set_header X-Real-IP \$remote_addr; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; @@ -11,6 +11,6 @@ location ${SEARX_URL_PATH} { proxy_set_header X-Script-Name ${SEARX_URL_PATH}; } -location ${SEARX_URL_PATH}/static { - alias ${SEARX_SRC}/searx/static; +location ${SEARX_URL_PATH}/static/ { + alias ${SEARX_SRC}/searx/static/; } |