Selaa lähdekoodia

[searx] Update to use pkg and py38

Colin Powell 3 vuotta sitten
vanhempi
commit
ac2d4845b5

+ 2 - 2
ansible/roles/searx/files/searx.rc

@@ -32,8 +32,8 @@ rcvar=searx_enable
 export SEARX_SETTINGS_FILE="/usr/local/etc/searx-settings.yml"
 # daemon
 pidfile="/var/run/${name}.pid"
-python="/usr/local/bin/python3.7"
-script_py="/usr/local/lib/python3.7/site-packages/${name}/webapp.py"
+python="/usr/local/bin/python3.8"
+script_py="/usr/local/lib/python3.8/site-packages/${name}/webapp.py"
 command=/usr/sbin/daemon
 procname="daemon"
 command_args=" -c -f -P ${pidfile} ${python} ${script_py}"

+ 2 - 2
ansible/roles/searx/handlers/main.yml

@@ -8,7 +8,7 @@
     name: morty
     state: restarted
 
-- name: uwsgi restarted
+- name: Searx restarted
   service:
-    name: uwsgi
+    name: searx
     state: restarted

+ 13 - 36
ansible/roles/searx/tasks/main.yml

@@ -1,29 +1,11 @@
 ---
 - name: Dependencies installed
   community.general.pkgng:
-    name: py37-pip,py37-lxml,py37-yaml,filtron,morty,rust,uwsgi,git
+    name: "searx, filtron, morty"
     state: latest
 
-- name: Searx src folder exists
-  file:
-    path: /usr/local/src/searx
-    owner: root
-    mode: 0755
-    state: directory
-
-- name: Searx source @ master
-  git:
-    repo: "https://github.com/searx/searx.git"
-    dest: /usr/local/src/searx
-    update: yes
-
-- name: Searx dependencies up-to-date
-  shell:
-    cmd: python3.7 /usr/local/src/searx/setup.py install
-    chdir: /usr/local/src/searx
-
-- name: uWSGI enabled
-  shell: sysrc uwsgi_enable="YES"
+- name: Searx enabled
+  shell: sysrc searx_enable="YES"
 
 - name: Filtron enabled
   shell: sysrc filtron_enable="YES"
@@ -35,22 +17,8 @@
   template:
     src: searx-settings.yml.j2
     dest: /usr/local/etc/searx-settings.yml
-    owner: uwsgi
-    mode: 0600
-
-- name: uwsgi folder exists
-  file:
-    path: /usr/local/etc/uwsgi
-    mode: 0755
-    state: directory
-
-- name: uwsgi config installed
-  copy:
-    src: uwsgi.ini
-    dest: /usr/local/etc/uwsgi/uwsgi.ini
-    owner: root
     mode: 0600
-  notify: uwsgi restarted
+  notify: Searx restarted
 
 - name: Filtron rules installed
   copy:
@@ -75,3 +43,12 @@
     owner: root
     mode: 0700
   notify: Morty restarted
+
+- name: Filtron started
+  service: name=filtron state=started
+
+- name: Morty started
+  service: name=morty state=started
+
+- name: Searx started
+  service: name=searx state=started

+ 1 - 1
ansible/roles/searx/templates/morty.rc.j2

@@ -34,7 +34,7 @@ rcvar=morty_enable
 pidfile="/var/run/${name}.pid"
 command="/usr/local/bin/${name}"
 procname="morty"
-command_args=" -listen 0.0.0.0:3000 -key {{morty_secret_key}} &"
+command_args=" -listen 0.0.0.0:3003 -key {{morty_secret_key}} &"
 start_precmd="morty_precmd"
 
 morty_precmd() {

+ 0 - 6
ansible/roles/searx/templates/searx-settings.yml.j2

@@ -667,12 +667,6 @@ engines:
     shortcut: nt
     disabled: True
 
-  - name: acgsou
-    engine: acgsou
-    shortcut: acg
-    disabled: True
-    timeout: 5.0
-
   - name: openairedatasets
     engine: json_engine
     paging: True