From 0a0ac78898269f84f2d9bfa2a2f7fe2d4053bbaa Mon Sep 17 00:00:00 2001 From: Opnxng Date: Mon, 10 Feb 2025 22:07:03 +0800 Subject: [PATCH] SearXNG: remove donate page --- config-tasks/searxng.yaml | 8 ------- files/searxng/donate.md | 10 --------- files/teddit/about.pug | 35 ------------------------------- files/teddit/topbar.pug | 25 ---------------------- templates/compose/searxng.yaml.j2 | 3 +-- vars/services.yaml | 22 ++++++++++++++++--- 6 files changed, 20 insertions(+), 83 deletions(-) delete mode 100755 files/searxng/donate.md delete mode 100644 files/teddit/about.pug delete mode 100644 files/teddit/topbar.pug diff --git a/config-tasks/searxng.yaml b/config-tasks/searxng.yaml index 812efa3..182d072 100644 --- a/config-tasks/searxng.yaml +++ b/config-tasks/searxng.yaml @@ -29,14 +29,6 @@ group: 1000 mode: 0755 - - name: Copy donate.md - copy: - src: "searxng/donate.md" - dest: "{{ docker_dir }}/searxng/donate.md" - owner: 1000 - group: 1000 - mode: 0755 - - name: Create valkey-data directory ansible.builtin.file: path: "{{ docker_dir }}/searxng/valkey-data" diff --git a/files/searxng/donate.md b/files/searxng/donate.md deleted file mode 100755 index 7d0490b..0000000 --- a/files/searxng/donate.md +++ /dev/null @@ -1,10 +0,0 @@ -# Donate - -[Opnxng](https://about.opnxng.com/) hosts privacy-respecting services such as [SearXNG](https://opnxng.com/) and [many more](https://about.opnxng.com/services). - -Please consider donating to this site via [Liberapay](https://liberapay.com/Opnxng/). Your donation would allow us to rent more instances and run the services more reliably. We truly thank you for your consideration. -
-
-## Donate to SearXNG.org - -Support the SearXNG project via [https://docs.searxng.org/donate.html](https://docs.searxng.org/donate.html) diff --git a/files/teddit/about.pug b/files/teddit/about.pug deleted file mode 100644 index 425a4d5..0000000 --- a/files/teddit/about.pug +++ /dev/null @@ -1,35 +0,0 @@ -doctype html -html - head - title about - teddit - meta(property='og:title', content='about - teddit') - include includes/meta_default.pug - include includes/meta_description.pug - include includes/head.pug - body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "") - include includes/topbar.pug - .container - .content - h1 About - p Teddit is a free and open source alternative Reddit front-end focused on privacy. Teddit doesn't require you to have JavaScript enabled in your browser. The source is available on Codeberg at https://codeberg.org/teddit/teddit. This instance utilizes Cloudflare Warp to avoid rate limiting. Please be aware of the privacy implications. The instance is hosted only to mitigate bad experiences on a bad platform. Seek greener pastures! - ul - li No JavaScript or ads - li All requests go through the backend, client never talks to Reddit - li Prevents Reddit from tracking your IP or JavaScript fingerprint - li Lightweight (teddit frontpage: ~30 HTTP requests with ~270 KB of data downloaded vs. Reddit frontpage: ~190 HTTP requests with ~24 MB) - br - a(href="/privacy") Privacy policy - h2 Opnxng.com - ul - li Other services: https://about.opnxng.com/ - li Donating: https://liberapay.com/Opnxng/ - li Links to donate to the developer of Teddit can be found down below. - h2 Donating - p(class="word-break") XMR: 832ogRwuoSs2JGYg7wJTqshidK7dErgNdfpenQ9dzMghNXQTJRby1xGbqC3gW3GAifRM9E84J91VdMZRjoSJ32nkAZnaCEj - h2 Legal - p Teddit does not host any content. All content shown on any Teddit instances is from Reddit™. Reddit is a trademark of Reddit Inc. Teddit is not affiliated with Reddit Inc. Any issues with content shown on any Teddit instances need to be reported to Reddit, not the instance host's internet provider or domain provider. - .bottom - a(href="https://en.wikipedia.org/wiki/Piratbyr%C3%A5n#Kopimi", target="_blank") - img(src="kopimi.gif") - p.version v.0.4.9 - include includes/footer.pug diff --git a/files/teddit/topbar.pug b/files/teddit/topbar.pug deleted file mode 100644 index a8aebd4..0000000 --- a/files/teddit/topbar.pug +++ /dev/null @@ -1,25 +0,0 @@ -div#topbar - nav - .nav-item.left - a(href="/") - img(src="/favicon.png", alt="") - | teddit - .settings - .icon-container - a(href="/about", style={'color': '#fbad41'}) [about] - .icon-container - a(href="/preferences") [preferences] - .top-links - if user_preferences.subbed_subreddits && Array.isArray(user_preferences.subbed_subreddits) - a(href="/r/popular") Popular - a(href="/r/all") All - a(href="/saved") Saved - each subreddit in user_preferences.subbed_subreddits - a(href="/r/" + subreddit) #{subreddit} - else if instance_config.suggested_subreddits && Array.isArray(instance_config.suggested_subreddits) - each subreddit in instance_config.suggested_subreddits - if subreddit.toLowerCase() === 'saved' - a(href="/saved") Saved - else - a(href="/r/" + subreddit) #{subreddit} - a(href="/subreddits", id="sr-more-link") more » \ No newline at end of file diff --git a/templates/compose/searxng.yaml.j2 b/templates/compose/searxng.yaml.j2 index d89e958..9a90bd3 100644 --- a/templates/compose/searxng.yaml.j2 +++ b/templates/compose/searxng.yaml.j2 @@ -32,7 +32,6 @@ services: - {{ docker_dir }}/searxng/settings.yml:/etc/searxng/settings.yml - {{ docker_dir }}/searxng/replace-hosts.yml:/etc/searxng/replace-hosts.yml - {{ docker_dir }}/searxng/remove-hosts.yml:/etc/searxng/remove-hosts.yml - - {{ docker_dir }}/searxng/donate.md:/etc/searxng/infopage/en/donate.md network_mode: host searxng-redis: @@ -60,4 +59,4 @@ services: max-size: "1m" max-file: "1" restart: always - network_mode: host \ No newline at end of file + network_mode: host diff --git a/vars/services.yaml b/vars/services.yaml index 4ecdfb3..34472a0 100644 --- a/vars/services.yaml +++ b/vars/services.yaml @@ -1,8 +1,24 @@ +config: + oracle1: + - searxng + oracle2: + - searxng + oracle3: + - searxng + oracle4: + - searxng + compose: oracle1: - - send + - searxng + oracle2: + - searxng + oracle3: + - searxng + oracle4: + - searxng -# ---------------------------------------------------------------------------------------------------- +# ------------------------------ deployed_compose: vultr: @@ -107,7 +123,7 @@ deployed_compose: - socks5 - priviblur -# ---------------------------------------------------------------------------------------------------- +# ------------------------------ deployed_config: oracle1: