From d6b902e204b0aabab47ecf9093a314995c76be76 Mon Sep 17 00:00:00 2001 From: bronsen Date: Mon, 3 Mar 2025 22:05:03 +0100 Subject: [PATCH 1/3] [playbook] install (php-)composer from debian --- playbooks/playbook.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/playbooks/playbook.yaml b/playbooks/playbook.yaml index b024e11..2c3ff72 100644 --- a/playbooks/playbook.yaml +++ b/playbooks/playbook.yaml @@ -51,6 +51,7 @@ - libapache2-mod-php8.2 - python3-mysqldb - default-mysql-server + - composer - name: Install the firewall ansible.builtin.apt: @@ -119,21 +120,6 @@ host: localhost state: present - - name: Download Composer installer. - ansible.builtin.get_url: - url: https://getcomposer.org/installer - dest: /tmp/composer-installer.php - mode: "0755" - - name: Run Composer installer. - ansible.builtin.command: > - php composer-installer.php - chdir=/tmp - creates=/usr/local/bin/composer - - name: Mov Composer into globally-accessible location. - ansible.builtin.command: > - mv /tmp/composer.phar /usr/local/bin/composer - creates=/usr/local/bin/composer - - name: Ensure Drupal directory exists. ansible.builtin.file: path: "{{ drupal_core_path }}" From b29daca8a354a9321d7eb6555f1b1d447d477221 Mon Sep 17 00:00:00 2001 From: bronsen Date: Mon, 3 Mar 2025 22:09:04 +0100 Subject: [PATCH 2/3] [playbook,drupal] install actually installable version of drupal and drush --- playbooks/playbook.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/playbook.yaml b/playbooks/playbook.yaml index 2c3ff72..23db4e5 100644 --- a/playbooks/playbook.yaml +++ b/playbooks/playbook.yaml @@ -134,7 +134,7 @@ - name: Create Drupal project. community.general.composer: command: create-project - arguments: drupal/recommended-project:^9 "{{ drupal_core_path }}" + arguments: drupal/recommended-project:^10 "{{ drupal_core_path }}" working_dir: "{{ drupal_core_path }}" no_dev: true become_user: www-data @@ -151,7 +151,7 @@ - name: Add drush to the Drupal site with composer. community.general.composer: command: require - arguments: "drush/drush:^11" + arguments: "drush/drush" working_dir: "{{ drupal_core_path }}" become_user: www-data when: not drupal_composer_json.stat.exists From 74e978886c5c0d8fb1c8d64389da45bfca0910f8 Mon Sep 17 00:00:00 2001 From: bronsen Date: Mon, 3 Mar 2025 22:09:48 +0100 Subject: [PATCH 3/3] [playbook,mysql] fix database URI it has a "double slash" but only one colon --- playbooks/playbook.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/playbook.yaml b/playbooks/playbook.yaml index 23db4e5..8ebf8a7 100644 --- a/playbooks/playbook.yaml +++ b/playbooks/playbook.yaml @@ -161,7 +161,7 @@ vendor/bin/drush si -y --site-name="{{ drupal_site_name }}" --account-name=admin --account-pass=admin - --db-url=mysql:://{{ domain }}:1234@localhost/{{ domain }} + --db-url=mysql://{{ domain }}:1234@localhost/{{ domain }} --root={{ drupal_core_path }}/web chdir={{ drupal_core_path }} creates={{ drupal_core_path }}/web/sites/default/settings.php