mirror of
https://github.com/internetarchive/brozzler.git
synced 2025-04-20 23:56:34 -04:00
Fixes for modern Python3 packaging and Ansible 2.14
This commit is contained in:
parent
8e84033568
commit
3515fbd974
@ -9,7 +9,7 @@
|
||||
name: '{{brozzler_pip_name}}[dashboard]'
|
||||
virtualenv: '{{venv_root}}/brozzler-dashboard-ve3'
|
||||
virtualenv_python: python3
|
||||
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
|
||||
virtualenv_command: python3 -mvirtualenv
|
||||
extra_args: '--no-input --upgrade --pre --cache-dir=/tmp/pip-cache'
|
||||
become: true
|
||||
become_user: '{{user}}'
|
||||
|
@ -51,7 +51,7 @@
|
||||
file: path={{venv_root}}/websockify-ve3 state=directory owner={{user}}
|
||||
|
||||
#get python3 version for checks below
|
||||
- shell: "python --version"
|
||||
- shell: "python3 --version"
|
||||
register: python_installed
|
||||
|
||||
#websockify's dependency numpy's latest version no longer supports 3.5
|
||||
@ -60,7 +60,7 @@
|
||||
name: numpy==1.18.4
|
||||
virtualenv: '{{venv_root}}/websockify-ve3'
|
||||
virtualenv_python: python3
|
||||
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
|
||||
virtualenv_command: python3 -mvirtualenv
|
||||
extra_args: '--no-input --upgrade --pre --cache-dir=/tmp/pip-cache'
|
||||
become: true
|
||||
become_user: '{{user}}'
|
||||
@ -71,7 +71,7 @@
|
||||
name: git+https://github.com/kanaka/websockify.git#egg=websockify
|
||||
virtualenv: '{{venv_root}}/websockify-ve3'
|
||||
virtualenv_python: python3
|
||||
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
|
||||
virtualenv_command: python3 -mvirtualenv
|
||||
extra_args: '--no-input --upgrade --pre --cache-dir=/tmp/pip-cache'
|
||||
become: true
|
||||
become_user: '{{user}}'
|
||||
@ -94,7 +94,7 @@
|
||||
name: '{{brozzler_pip_name}}'
|
||||
virtualenv: '{{venv_root}}/brozzler-ve3'
|
||||
virtualenv_python: python3
|
||||
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
|
||||
virtualenv_command: python3 -mvirtualenv
|
||||
extra_args: '--no-input --upgrade --pre --cache-dir=/tmp/pip-cache'
|
||||
become: true
|
||||
become_user: '{{user}}'
|
||||
|
@ -70,7 +70,7 @@
|
||||
changed_when: false
|
||||
|
||||
- name: ensure service user {{user}} exists
|
||||
user: name={{user}} system=yes createhome=no home=/nonexistent
|
||||
user: name={{user}} system=yes createhome=yes home=/home/{{user}}
|
||||
shell=/usr/sbin/nologin
|
||||
become: true
|
||||
when: id_user|failed
|
||||
when: id_user.rc != 0
|
||||
|
@ -10,7 +10,7 @@
|
||||
version: 0.33.2
|
||||
virtualenv: '{{venv_root}}/pywb-ve3'
|
||||
virtualenv_python: python3
|
||||
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
|
||||
virtualenv_command: python3 -mvirtualenv
|
||||
extra_args: '--no-input --upgrade --pre --cache-dir=/tmp/pip-cache'
|
||||
become: true
|
||||
become_user: '{{user}}'
|
||||
@ -22,7 +22,7 @@
|
||||
name: '{{brozzler_pip_name}}'
|
||||
virtualenv: '{{venv_root}}/pywb-ve3'
|
||||
virtualenv_python: python3
|
||||
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
|
||||
virtualenv_command: python3 -mvirtualenv
|
||||
extra_args: '--no-input --upgrade --pre --cache-dir=/tmp/pip-cache'
|
||||
become: true
|
||||
become_user: '{{user}}'
|
||||
|
@ -5,6 +5,6 @@ touch $logfile
|
||||
chown {{user}} $logfile
|
||||
|
||||
exec nice setuidgid {{user}} env PYWB_CONFIG_FILE=/etc/pywb.yml \
|
||||
{{venv_root}}/pywb-ve3/bin/python {{venv_root}}/pywb-ve3/bin/brozzler-wayback \
|
||||
{{venv_root}}/pywb-ve3/bin/python3 {{venv_root}}/pywb-ve3/bin/brozzler-wayback \
|
||||
>> $logfile 2>&1
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
virtualenv: '{{venv_root}}/warcprox-ve3'
|
||||
virtualenv_python: python3
|
||||
extra_args: --no-input --upgrade --pre --cache-dir=/tmp/pip-cache
|
||||
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
|
||||
virtualenv_command: python3 -mvirtualenv
|
||||
become: true
|
||||
become_user: '{{user}}'
|
||||
notify:
|
||||
|
Loading…
x
Reference in New Issue
Block a user