diff --git a/roles/collab/files/collab-init.sh b/roles/collab/files/collab-init.sh index d77318d..efb6233 100644 --- a/roles/collab/files/collab-init.sh +++ b/roles/collab/files/collab-init.sh @@ -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 diff --git a/roles/collab/tasks/main.yml b/roles/collab/tasks/main.yml index 2c3dd42..2a4580d 100644 --- a/roles/collab/tasks/main.yml +++ b/roles/collab/tasks/main.yml @@ -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