From 499c7b3cceb90684af9825cc428aa365b35b4c6f Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 1 Oct 2021 09:48:53 +0200 Subject: [PATCH] SearXNG: .github, searxng-docker --- .github/ISSUE_TEMPLATE/bug-report.md | 16 ++++++++-------- .github/ISSUE_TEMPLATE/engine-request.md | 8 ++++---- .github/ISSUE_TEMPLATE/feature-request.md | 4 ++-- .github/workflows/data-update.yml | 2 +- Dockerfile | 4 ++-- Makefile | 2 +- searx/templates/__common__/new_issue.html | 4 ++-- setup.py | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 70e490c0d..76a1f1145 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -1,27 +1,27 @@ --- name: Bug report -about: Report a bug in Searx +about: Report a bug in SearXNG title: '' labels: bug assignees: '' --- - + -**Version of Searx, commit number if you are using on master branch and stipulate if you forked Searx** +**Version of SearXNG, commit number if you are using on master branch and stipulate if you forked SearXNG** -**How did you install Searx?** - **What happened?** diff --git a/.github/ISSUE_TEMPLATE/engine-request.md b/.github/ISSUE_TEMPLATE/engine-request.md index 3074316a7..8aa576ab3 100644 --- a/.github/ISSUE_TEMPLATE/engine-request.md +++ b/.github/ISSUE_TEMPLATE/engine-request.md @@ -1,12 +1,12 @@ --- name: Engine request -about: Request a new engine in Searx +about: Request a new engine in SearXNG title: '' labels: enhancement, engine request assignees: '' --- - + **Working URL to the engine** @@ -17,13 +17,13 @@ assignees: '' **Features of this engine** -**How can Searx fetch the information from this engine?** +**How can SearXNG fetch the information from this engine?** diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md index 63e24b85b..a0d61c824 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -1,12 +1,12 @@ --- name: Feature request -about: Request a new feature in Searx +about: Request a new feature in SearXNG title: '' labels: enhancement assignees: '' --- - + **Is your feature request related to a problem? Please describe.** diff --git a/.github/workflows/data-update.yml b/.github/workflows/data-update.yml index d2d5b83cb..86df5d59c 100644 --- a/.github/workflows/data-update.yml +++ b/.github/workflows/data-update.yml @@ -48,7 +48,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: commit-message: Update searx.data - ${{ matrix.fetch }} - committer: searx-bot + committer: searxng-bot author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> signoff: false branch: update_data_${{ matrix.fetch }} diff --git a/Dockerfile b/Dockerfile index 63f886eba..a05adaf4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,11 +80,11 @@ LABEL maintainer="searxng <${GIT_URL}>" \ org.label-schema.vcs-ref=${LABEL_VCS_REF} \ org.label-schema.vcs-url=${LABEL_VCS_URL} \ org.label-schema.build-date="${LABEL_DATE}" \ - org.label-schema.usage="https://github.com/searx/searx-docker" \ + org.label-schema.usage="https://github.com/searxng/searxng-docker" \ org.opencontainers.image.title="searxng" \ org.opencontainers.image.version="${SEARX_GIT_VERSION}" \ org.opencontainers.image.url="${LABEL_VCS_URL}" \ org.opencontainers.image.revision=${LABEL_VCS_REF} \ org.opencontainers.image.source=${LABEL_VCS_URL} \ org.opencontainers.image.created="${LABEL_DATE}" \ - org.opencontainers.image.documentation="https://github.com/searx/searx-docker" + org.opencontainers.image.documentation="https://github.com/searxng/searxng-docker" diff --git a/Makefile b/Makefile index 3710af4ec..a4362b171 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ help: @./manage --help @echo '----' @echo 'run - run developer instance' - @echo 'install - developer install of searx into virtualenv' + @echo 'install - developer install of SearxNG into virtualenv' @echo 'uninstall - uninstall developer installation' @echo 'clean - clean up working tree' @echo 'search.checker - check search engines' diff --git a/searx/templates/__common__/new_issue.html b/searx/templates/__common__/new_issue.html index d001df6b5..55dbefe60 100644 --- a/searx/templates/__common__/new_issue.html +++ b/searx/templates/__common__/new_issue.html @@ -18,7 +18,7 @@ in order to fetch the latest commit ID: ``` git log -1 ``` -If you are using searx-docker then look at the bottom of the SearXNG page +If you are using searxng-docker then look at the bottom of the SearXNG page and check for the version after "Powered by SearXNG" Please also stipulate if you are using a forked version of SearxNG and @@ -26,7 +26,7 @@ include a link to the fork source code. --> {% endif %} **How did you install SearXNG?** - **What happened?** diff --git a/setup.py b/setup.py index 6a2f7c1f4..92eb8e14e 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -"""Installer for Searx package.""" +"""Installer for SearXNG package.""" from setuptools import setup from setuptools import find_packages @@ -17,7 +17,7 @@ with open('requirements-dev.txt') as f: dev_requirements = [ l.strip() for l in f.readlines()] setup( - name='searx', + name='searxng', version=VERSION_TAG, description="A privacy-respecting, hackable metasearch engine", long_description=long_description,