diff --git a/roles/_web_app/scripts/install_composer.sh b/roles/_web_app/scripts/install_composer.sh deleted file mode 100644 index 149e6b1955147be77e6952fd906b666bd5a895d5..0000000000000000000000000000000000000000 --- a/roles/_web_app/scripts/install_composer.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -EXPECTED_SIGNATURE=$(wget -q -O - https://composer.github.io/installer.sig) -php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');") - -if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ] -then - >&2 echo 'ERROR: Invalid installer signature' - rm composer-setup.php - exit 1 -fi - -php composer-setup.php -RESULT=$? -rm composer-setup.php -exit $RESULT diff --git a/roles/_web_app/tasks/composer.yml b/roles/_web_app/tasks/composer.yml deleted file mode 100644 index 66aa99718b2fc1bbbac8ca163ed5d6af5e2e7f35..0000000000000000000000000000000000000000 --- a/roles/_web_app/tasks/composer.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - - - name: Download Composer - script: scripts/install_composer.sh - tags: - - composer - - - name: Move Composer globally - become: true - command: mv composer.phar /usr/local/bin/composer - tags: - - composer - - - name: Set permissions on Composer - become: true - file: - path: /usr/local/bin/composer - mode: "a+x" - tags: - - composer - diff --git a/roles/_web_app/tasks/install.yml b/roles/_web_app/tasks/install.yml index 856a1160d62241a889e9a062e22a21bc1896f294..631e3c9358fc9a4f759b58eed1f25b0256ecc798 100644 --- a/roles/_web_app/tasks/install.yml +++ b/roles/_web_app/tasks/install.yml @@ -19,10 +19,6 @@ user_password: "{{ app_user_password }}" when: app_user is defined - - name: install composer - import_tasks: composer.yml - when: php_composer == "yes" - - import_tasks: deploy_program.yml - import_role: diff --git a/roles/yeswiki_instance/vars/main.yml b/roles/yeswiki_instance/vars/main.yml index f991cbfe5bc6e2c30b96f18751f28aa4a2d70fa1..2954283fec38081010d5e8ee68cd61cfbd3488c2 100644 --- a/roles/yeswiki_instance/vars/main.yml +++ b/roles/yeswiki_instance/vars/main.yml @@ -1,7 +1,6 @@ --- app_program: "YesWiki" app_git_repo: "https://github.com/YesWiki/yeswiki.git" - app_version: "doryphore" + app_version: "cercopitheque" app_old_version: "cercopitheque" database_type: "mysql" - php_composer: "yes" \ No newline at end of file