cannot commit till I fix all the problems I caused

.github/workflows/merge-upstream-master.yml

@@ -6,38 +6,38 @@ on:
   schedule:
      # actually, ~5 minutes is the highest
      # effective frequency you will get
-    - cron:  '0 3 * * 1'
+    - cron: '0 3 * * 1'
   workflow_dispatch: #run manually
-      
+
 jobs:
   merge:
     runs-on: ubuntu-latest
     steps:
       # Step 1: run a standard checkout action, provided by github
-    - name: Checkout main
-      uses: actions/[email protected]
-      with:
-        ref: master
-        fetch-depth: 0
-        # submodules: 'recursive'     ### may be needed in your situation
+      - name: Checkout main
+        uses: actions/[email protected]
+        with:
+          ref: master
+          fetch-depth: 0
+          # submodules: 'recursive'     ### may be needed in your situation
 
-    # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
-    - name: Sync-Fork-action
-      #uses: XueMoMo/[email protected]
-      uses: aormsby/[email protected]
-      with:
-        upstream_repository: traefikturkey/onramp
-        upstream_branch: master
-        target_branch: master
-        #git_pull_rebase_config: true
-        # git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
-        # github_token: ${{ secrets.GITHUB_TOKEN }}   # optional, for accessing repos that require authentication
+      # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
+      - name: Sync-Fork-action
+        #uses: XueMoMo/[email protected]
+        uses: aormsby/[email protected]
+        with:
+          upstream_repository: traefikturkey/onramp
+          upstream_branch: master
+          target_branch: master
+          #git_pull_rebase_config: true
+          # git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
+          # github_token: ${{ secrets.GITHUB_TOKEN }}   # optional, for accessing repos that require authentication
 
-    # Step 3: Display a message if 'sync' step had new commits (simple test)
-    - name: Check for new commits
-      if: steps.sync.outputs.has_new_commits
-      run: echo "There were new commits."
+      # Step 3: Display a message if 'sync' step had new commits (simple test)
+      - name: Check for new commits
+        if: steps.sync.outputs.has_new_commits
+        run: echo "There were new commits."
 
-    # Step 4: Print a helpful timestamp for your records (not required, just nice)
-    - name: Timestamp
-      run: date
+      # Step 4: Print a helpful timestamp for your records (not required, just nice)
+      - name: Timestamp
+        run: date

.yamlignore

@@ -0,0 +1 @@
+etc/

.yamllint

@@ -1,10 +1,4 @@
-ignore: |
-  etc/
-  .github/
-  overrides-enabled/
-  services-enabled/
-
-ignore-from-file: .gitignore
+ignore-from-file: [.gitignore, .yamlignore]
 
 extends: default
 
@@ -14,8 +8,10 @@ yaml-files:
   - '.yamllint'
 
 rules:
+  truthy: disable
   quoted-strings: disable
   line-length: disable
   document-start: disable
   comments: disable
   comments-indentation: disable
+  new-line-at-end-of-file: disable

etc/searxng/settings.template.yml

@@ -1,20 +1,18 @@
-
 use_default_settings: true
 server:
   # base_url is defined in the SEARXNG_BASE_URL environment variable, see .env and docker-compose.yml
-  secret_key: "CHANGEME!"  # change this! 
-  limiter: true  # can be disabled for a private instance 
-  image_proxy: true 
+  secret_key: "CHANGEME!"  # change this!
+  limiter: true  # can be disabled for a private instance
+  image_proxy: true
   method: "GET"
 ui:
   static_use_hash: true
 redis:
   url: redis://searxng-redis:6379/0
 general:
- debug: false
- instance_name: "SearXNG"
- contact_url: false
- enable_metrics: true
+  debug: false
+  instance_name: "SearXNG"
+  contact_url: false
+  enable_metrics: true
 search:
- autocomplete: "google"
-
+  autocomplete: "google"

make.d/install.mk

@@ -12,13 +12,21 @@ install: build install-docker
 	cp .templates/env.template .env
 	$(EDITOR) .env
 
-EXECUTABLES = git nano jq yq yamllint
+EXECUTABLES = git nano jq yq pip yamllint
 MISSING_PACKAGES := $(foreach exec,$(EXECUTABLES),$(if $(shell which $(exec)),,addpackage-$(exec)))
 
 addrepositories:
 	sudo apt-add-repository ppa:rmescandon/yq -y
 	sudo apt update
 
+addpackage-pip:
+	curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+	sudo python3 get-pip.py
+	rm get-pip.py
+
+addpackage-yamllint: addpackage-pip
+	sudo pip install --root-user-action=ignore yamllint
+
 addpackage-%: addrepositories
 	DEBIAN_FRONTEND=noninteractive sudo apt install $* -y