Skip to content

Commit

Permalink
Update paths for PHP 8.1
Browse files Browse the repository at this point in the history
  - Remove Global Drush install, no longer recommended and broken.
  - See: drush-ops/drush#5156
  - Adds path for wpcli to be owned by Apache (this errors if not done)
  - Removes php-pecl-mcrypt, the library is deprecated and the
    Alpine package has not been updated to PHP 8.1.
  • Loading branch information
madeline-holland committed Oct 1, 2022
1 parent 8a58066 commit 126cc97
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
8 changes: 4 additions & 4 deletions src/ansible/group_vars/flightdeck_web.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
flighdeck_motd_name: web 8.0
flighdeck_motd_name: web 8.1

flightdeck_groups:
- name: "apache"
Expand All @@ -9,12 +9,12 @@ flightdeck_users:
group: "apache"
home: "/var/www"

flightdeck_root_prompt: '\u@flightdeck-web-8.0:\w# '
flightdeck_user_prompt: '\u@flightdeck-web-8.0:\w$ '
flightdeck_root_prompt: '\u@flightdeck-web-8.1:\w# '
flightdeck_user_prompt: '\u@flightdeck-web-8.1:\w$ '

flightdeck_motd_links:
- name: 'Code & docs'
url: 'https://github.com/ten7/flightdeck-web-8.0'
url: 'https://github.com/ten7/flightdeck-web-8.1'
- name: ' Learn more'
url: 'https://flightdeck.ten7.com/'

Expand Down
15 changes: 2 additions & 13 deletions src/ansible/roles/flightdeck-web-build/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
- "php81-json"
- "php81-ldap"
- "php81-mbstring"
- "php81-pecl-mcrypt"
- "php81-pecl-memcached"
- "php81-mysqli"
- "php81-mysqlnd"
Expand Down Expand Up @@ -73,7 +72,7 @@
- clear caches
- name: Add global php symlink
file:
src: "/usr/bin/php8"
src: "/usr/bin/php81"
dest: "/usr/local/bin/php"
state: link
force: yes
Expand All @@ -91,6 +90,7 @@
- "/etc/ssl/apache2"
- "/etc/apache2/sites.d"
- "/etc/php81"
- "/etc/wpcli"
- "/run/apache2"
- "/var/log/apache2"
- "/var/www"
Expand Down Expand Up @@ -128,15 +128,8 @@
group: "apache"
mode: "u=rwx,g=rwx,o=r"
loop:
- "/etc/drush10"
- "/etc/wpcli"
- "/var/www/.composer/vendor/bin"
- name: Install Drush 10.x
shell: >
composer require drush/drush:{{ flightdeck_drush_version | default('^10.6.2') }} &&
/etc/drush10/vendor/bin/drush core:init -y
args:
chdir: "/etc/drush10"
become: yes
become_user: "apache"
become_method: "su"
Expand All @@ -155,10 +148,6 @@
force: yes
follow: no
loop:
- src: "/etc/drush10/vendor/bin/drush"
dest: "/usr/local/bin/drush10"
- src: "/etc/drush10/vendor/bin/drush"
dest: "/var/www/.composer/vendor/bin/drush"
- src: "/etc/wpcli/wp"
dest: "/usr/local/bin/wp"
- name: Set node global packages to install as user-local
Expand Down

0 comments on commit 126cc97

Please sign in to comment.