From 151727a91ef56d2ad50ef5d3af55f08a999b4701 Mon Sep 17 00:00:00 2001 From: Seth Shaw Date: Thu, 31 May 2018 14:51:19 -0700 Subject: [PATCH 1/4] use php console migrations:migrate to install gemini table --- tasks/db-mysql.yml | 13 ------------- tasks/db-pgsql.yml | 10 ---------- tasks/gemini.yml | 11 +++++++++++ tasks/main.yml | 5 +++++ templates/database/gemini-mysql.sql | 6 ------ templates/database/gemini-pgsql.sql | 7 ------- 6 files changed, 16 insertions(+), 36 deletions(-) create mode 100644 tasks/gemini.yml delete mode 100644 templates/database/gemini-mysql.sql delete mode 100644 templates/database/gemini-pgsql.sql diff --git a/tasks/db-mysql.yml b/tasks/db-mysql.yml index 9c03f8b..fbe1d13 100644 --- a/tasks/db-mysql.yml +++ b/tasks/db-mysql.yml @@ -12,16 +12,3 @@ password: "{{ crayfish_db_password }}" state: present priv: "{{crayfish_db_name}}.*:ALL" - -- name: Grab Gemini db schema (mysql) - template: - src: "database/gemini-mysql.sql" - dest: "/tmp/gemini.sql" - when: gemini_db_exists.changed - -- name: Install Gemini db schema (mysql) - mysql_db: - state: import - name: all - target: "/tmp/gemini.sql" - when: gemini_db_exists.changed diff --git a/tasks/db-pgsql.yml b/tasks/db-pgsql.yml index 1c80fbd..f09aba1 100644 --- a/tasks/db-pgsql.yml +++ b/tasks/db-pgsql.yml @@ -11,13 +11,3 @@ state: present owner: "{{ crayfish_db_user }}" register: gemini_db_exists - -- name: Grab Gemini db schema (pgsql) - template: - src: "database/gemini-pgsql.sql" - dest: "/tmp/gemini.sql" - when: gemini_db_exists.changed - -- name: Install Gemini db schema (pgsql) - command: psql -d {{ crayfish_db_name }} -f /tmp/gemini.sql - when: gemini_db_exists.changed diff --git a/tasks/gemini.yml b/tasks/gemini.yml new file mode 100644 index 0000000..d237e42 --- /dev/null +++ b/tasks/gemini.yml @@ -0,0 +1,11 @@ +--- + +- name: Gemini composer install + composer: + command: install + working_dir: "{{ crayfish_install_dir }}/Gemini" + +- name: Gemini migrate db + shell: php bin/console migrations:migrate + args: + chdir: "{{ crayfish_install_dir }}/Gemini" diff --git a/tasks/main.yml b/tasks/main.yml index 5e583b0..eb53a60 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -17,3 +17,8 @@ tags: - crayfish - crayfish-install + +- include: gemini.yml + tags: + - crayfish + - crayfish-gemini diff --git a/templates/database/gemini-mysql.sql b/templates/database/gemini-mysql.sql deleted file mode 100644 index d3c632f..0000000 --- a/templates/database/gemini-mysql.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE IF NOT EXISTS {{ crayfish_db_name }}.Gemini ( - id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, - uuid VARCHAR(36) NOT NULL UNIQUE, - drupal VARCHAR(2048) NOT NULL UNIQUE, - fedora VARCHAR(2048) NOT NULL UNIQUE -) ENGINE=InnoDB; diff --git a/templates/database/gemini-pgsql.sql b/templates/database/gemini-pgsql.sql deleted file mode 100644 index 8d54b15..0000000 --- a/templates/database/gemini-pgsql.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE Gemini ( - id SERIAL PRIMARY KEY, - uuid VARCHAR(36) NOT NULL UNIQUE, - drupal VARCHAR(2048) NOT NULL UNIQUE, - fedora VARCHAR(2048) NOT NULL UNIQUE -); -ALTER TABLE Gemini OWNER TO {{ crayfish_db_user }}; From 3e2830d35d35c400085b4db84bf7f559c27ea4a7 Mon Sep 17 00:00:00 2001 From: Seth Shaw Date: Fri, 1 Jun 2018 12:14:33 -0700 Subject: [PATCH 2/4] setting crayfish_version_tag to master --- defaults/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2ccf9c0..d83b65a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,12 +1,11 @@ -crayfish_user: www-data -crayfish_version_tag: 0.0.8 +crayfish_version_tag: master crayfish_services: - Gemini - Houdini - Milliner - Hypercube - + crayfish_install_dir: /var/www/html/Crayfish crayfish_syn_token: islandora @@ -89,4 +88,3 @@ crayfish_milliner_db_options: dbname: "{{ crayfish_db_name }}" user: "{{ crayfish_db_user }}" password: "{{ crayfish_db_password }}" - From 5c9b5e158cbac326c49a8a7e3b599a0cb75ac49c Mon Sep 17 00:00:00 2001 From: Seth Shaw Date: Fri, 1 Jun 2018 14:20:32 -0700 Subject: [PATCH 3/4] adding php_packages_extra Trying to appease Travis CI --- defaults/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index b046985..d63f65e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -94,3 +94,7 @@ crayfish_milliner_db_options: # httpd_conf_directory: /etc/apache2 # crayfish_packages: # - ImageMagick + +php_packages_extra: + - php7.0-mysql + - php7.0-pgsql From 5e84cfd5ae68015b71b0df5e8bedb46273b3cfb9 Mon Sep 17 00:00:00 2001 From: Seth Shaw Date: Thu, 14 Jun 2018 12:24:22 -0700 Subject: [PATCH 4/4] crayfish version + report ok when no migrations run --- defaults/main.yml | 2 +- tasks/gemini.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index d63f65e..2dde0c8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ -crayfish_version_tag: master +crayfish_version_tag: 0.0.9 crayfish_services: - Gemini diff --git a/tasks/gemini.yml b/tasks/gemini.yml index d237e42..1777512 100644 --- a/tasks/gemini.yml +++ b/tasks/gemini.yml @@ -9,3 +9,5 @@ shell: php bin/console migrations:migrate args: chdir: "{{ crayfish_install_dir }}/Gemini" + register: gemini_migrate + changed_when: '"No migrations to execute." not in gemini_migrate.stdout'