diff --git a/defaults/main.yml b/defaults/main.yml index 65d693d..2dde0c8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ -crayfish_version_tag: 0.0.8 +crayfish_version_tag: 0.0.9 crayfish_services: - Gemini @@ -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 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..1777512 --- /dev/null +++ b/tasks/gemini.yml @@ -0,0 +1,13 @@ +--- + +- 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" + register: gemini_migrate + changed_when: '"No migrations to execute." not in gemini_migrate.stdout' diff --git a/tasks/main.yml b/tasks/main.yml index 9dcac21..a05be72 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -36,3 +36,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 }};