Browse Source

Merge pull request #367 from dalf/searxng-github

SearXNG: .github, searxng-docker
Alexandre Flament 3 years ago
parent
commit
e39a03cc61

+ 8 - 8
.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,27 +1,27 @@
 ---
 ---
 name: Bug report
 name: Bug report
-about: Report a bug in Searx
+about: Report a bug in SearXNG
 title: ''
 title: ''
 labels: bug
 labels: bug
 assignees: ''
 assignees: ''
 
 
 ---
 ---
-<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SEARX -->
+<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SearXNG -->
 
 
-**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**
 <!-- If you are running on master branch using git execute this command
 <!-- If you are running on master branch using git execute this command
 in order to fetch the latest commit ID:
 in order to fetch the latest commit ID:
 ```
 ```
 git log -1
 git log -1
 ``` 
 ``` 
-If you are using searx-docker then look at the bottom of the Searx page
-and check for the version after "Powered by searx"
+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 Searx and
+Please also stipulate if you are using a forked version of SearXNG and
 include a link to the fork source code.
 include a link to the fork source code.
 -->
 -->
-**How did you install Searx?**
-<!-- Did you install Searx using the official wiki or using searx-docker
+**How did you install SearXNG?**
+<!-- Did you install SearXNG using the official wiki or using searxng-docker
 or manually by executing the searx/webapp.py file? -->
 or manually by executing the searx/webapp.py file? -->
 **What happened?**
 **What happened?**
 <!-- A clear and concise description of what the bug is. -->
 <!-- A clear and concise description of what the bug is. -->

+ 4 - 4
.github/ISSUE_TEMPLATE/engine-request.md

@@ -1,12 +1,12 @@
 ---
 ---
 name: Engine request
 name: Engine request
-about: Request a new engine in Searx
+about: Request a new engine in SearXNG
 title: ''
 title: ''
 labels: enhancement, engine request
 labels: enhancement, engine request
 assignees: ''
 assignees: ''
 
 
 ---
 ---
-<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SEARX -->
+<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SearXNG -->
 
 
 **Working URL to the engine**
 **Working URL to the engine**
 <!-- Please check if the engine is responding correctly before submitting it. -->
 <!-- Please check if the engine is responding correctly before submitting it. -->
@@ -17,13 +17,13 @@ assignees: ''
 **Features of this engine**
 **Features of this engine**
 <!-- Features of this engine: Doesn't track its users, fast, easy to integrate, ... -->
 <!-- Features of this engine: Doesn't track its users, fast, easy to integrate, ... -->
 
 
-**How can Searx fetch the information from this engine?**
+**How can SearXNG fetch the information from this engine?**
 <!-- List API URL, example code (using the correct markdown) and more
 <!-- List API URL, example code (using the correct markdown) and more
 that could be useful for the developers in order to implement this engine.
 that could be useful for the developers in order to implement this engine.
 If you don't know what to write, let this part blank.>
 If you don't know what to write, let this part blank.>
 
 
 **Applicable category of this engine**
 **Applicable category of this engine**
-<!-- Where should this new engine fit in Searx? Current categories in Searx:
+<!-- Where should this new engine fit in SearXNG? Current categories in SearXNG:
 general, files, images, it, map, music, news, science, social media and videos.
 general, files, images, it, map, music, news, science, social media and videos.
 You can add multiple categories at the same time. -->
 You can add multiple categories at the same time. -->
 
 

+ 2 - 2
.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,12 +1,12 @@
 ---
 ---
 name: Feature request
 name: Feature request
-about: Request a new feature in Searx
+about: Request a new feature in SearXNG
 title: ''
 title: ''
 labels: enhancement
 labels: enhancement
 assignees: ''
 assignees: ''
 
 
 ---
 ---
-<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SEARX -->
+<!-- PLEASE FILL THESE FIELDS, IT REALLY HELPS THE MAINTAINERS OF SearXNG -->
 
 
 **Is your feature request related to a problem? Please describe.**
 **Is your feature request related to a problem? Please describe.**
 <!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 <!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

+ 1 - 1
.github/workflows/data-update.yml

@@ -48,7 +48,7 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         uses: peter-evans/create-pull-request@v3
         with:
         with:
           commit-message: Update searx.data - ${{ matrix.fetch }}
           commit-message: Update searx.data - ${{ matrix.fetch }}
-          committer: searx-bot <noreply@github.com>
+          committer: searxng-bot <noreply@github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           signoff: false
           signoff: false
           branch: update_data_${{ matrix.fetch }}
           branch: update_data_${{ matrix.fetch }}

+ 2 - 2
Dockerfile

@@ -80,11 +80,11 @@ LABEL maintainer="searxng <${GIT_URL}>" \
       org.label-schema.vcs-ref=${LABEL_VCS_REF} \
       org.label-schema.vcs-ref=${LABEL_VCS_REF} \
       org.label-schema.vcs-url=${LABEL_VCS_URL} \
       org.label-schema.vcs-url=${LABEL_VCS_URL} \
       org.label-schema.build-date="${LABEL_DATE}" \
       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.title="searxng" \
       org.opencontainers.image.version="${SEARX_GIT_VERSION}" \
       org.opencontainers.image.version="${SEARX_GIT_VERSION}" \
       org.opencontainers.image.url="${LABEL_VCS_URL}" \
       org.opencontainers.image.url="${LABEL_VCS_URL}" \
       org.opencontainers.image.revision=${LABEL_VCS_REF} \
       org.opencontainers.image.revision=${LABEL_VCS_REF} \
       org.opencontainers.image.source=${LABEL_VCS_URL} \
       org.opencontainers.image.source=${LABEL_VCS_URL} \
       org.opencontainers.image.created="${LABEL_DATE}" \
       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"

+ 1 - 1
Makefile

@@ -14,7 +14,7 @@ help:
 	@./manage --help
 	@./manage --help
 	@echo '----'
 	@echo '----'
 	@echo 'run            - run developer instance'
 	@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 'uninstall      - uninstall developer installation'
 	@echo 'clean          - clean up working tree'
 	@echo 'clean          - clean up working tree'
 	@echo 'search.checker - check search engines'
 	@echo 'search.checker - check search engines'

+ 2 - 2
searx/templates/__common__/new_issue.html

@@ -18,7 +18,7 @@ in order to fetch the latest commit ID:
 ```
 ```
 git log -1
 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"
 and check for the version after "Powered by SearXNG"
 
 
 Please also stipulate if you are using a forked version of SearxNG and
 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 %}
 {% endif %}
 **How did you install SearXNG?**
 **How did you install SearXNG?**
-<!-- Did you install SearXNG using the official wiki or using searx-docker
+<!-- Did you install SearXNG using the official wiki or using searxng-docker
 or manually by executing the searx/webapp.py file? -->
 or manually by executing the searx/webapp.py file? -->
 **What happened?**
 **What happened?**
 <!-- A clear and concise description of what the bug is. -->
 <!-- A clear and concise description of what the bug is. -->

+ 2 - 2
setup.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
-"""Installer for Searx package."""
+"""Installer for SearXNG package."""
 
 
 from setuptools import setup
 from setuptools import setup
 from setuptools import find_packages
 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()]
     dev_requirements = [ l.strip() for l in f.readlines()]
 
 
 setup(
 setup(
-    name='searx',
+    name='searxng',
     version=VERSION_TAG,
     version=VERSION_TAG,
     description="A privacy-respecting, hackable metasearch engine",
     description="A privacy-respecting, hackable metasearch engine",
     long_description=long_description,
     long_description=long_description,