foo.sh/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collab: Force install commands to use python2

Browse source
This commit is contained in:
Timo Makinen 2021-03-30 14:46:51 +00:00
parent e21753a7c8
commit a7f22619f9
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/collab/files/collab-init.sh
View file

@ -18,7 +18,7 @@ if ! test -d /srv/wikis/collab/wikis/collab; then
su -s /bin/sh - collab -c "echo \" page_front_page = u'CollabList'\" >> /srv/wikis/collab/wikis/collab/config/collab.py"
su -s /bin/sh - collab -c "echo \" acl_rights_default = u'All:read,invite'\" >> /srv/wikis/collab/wikis/collab/config/collab.py"
su -s /bin/sh - collab -c "echo \" acl_rights_before = u'collab:admin,read,write FaciliatorGroup:read,write,admin,delete,revert,invite'\" >> /srv/wikis/collab/wikis/collab/config/collab.py"
su -s /bin/sh - collab -c "env PYTHONPATH=/srv/wikis/collab/wikis/collab/config python -m MoinMoin.packages -u collab i /srv/wikis/collab/underlay/pages/LanguageSetup/attachments/English--all_pages.zip"
su -s /bin/sh - collab -c "env PYTHONPATH=/srv/wikis/collab/wikis/collab/config python -m MoinMoin.packages -u collab i /var/lib/collab/CollabBase.zip"
su -s /bin/sh - collab -c "env PYTHONPATH=/srv/wikis/collab/wikis/collab/config python2 -m MoinMoin.packages -u collab i /srv/wikis/collab/underlay/pages/LanguageSetup/attachments/English--all_pages.zip"
su -s /bin/sh - collab -c "env PYTHONPATH=/srv/wikis/collab/wikis/collab/config python2 -m MoinMoin.packages -u collab i /var/lib/collab/CollabBase.zip"
su -s /bin/sh - collab -c "gwiki-rehash /srv/wikis/collab/wikis/collab"
fi

2
roles/collab/tasks/main.yml
View file

@ -67,12 +67,14 @@
pip:
name: ["{{ srcdir }}/graphingwiki", "{{ srcdir }}/collabbackend"]
umask: "0022"
executable: pip2
extra_args: --egg --no-index
- name: install moin
pip:
name: "{{ srcdir }}/moin-{{ moin_version }}"
umask: "0022"
executable: pip2
extra_args: --no-index
- name: create group collab