Skip to content

Commit

Permalink
install for content-modeing-overhaul branches of everything (#66)
Browse files Browse the repository at this point in the history
* install for content-modeing-overhaul branches of everything
* works, but drupal is accessed through localhost:8000/drupal/web :(
* Just leave it hardcoded since it runs on webserver anyway.  I'm such a fool
* Bumping internal roles
  • Loading branch information
dannylamb authored and jonathangreen committed Jun 20, 2018
1 parent 1193894 commit 364faee
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 176 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.require_version ">= 2.0.1", "<= 2.0.5"

$cpus = ENV.fetch("ISLANDORA_VAGRANT_CPUS", "1")
$memory = ENV.fetch("ISLANDORA_VAGRANT_MEMORY", "3072")
$memory = ENV.fetch("ISLANDORA_VAGRANT_MEMORY", "4096")
$hostname = ENV.fetch("ISLANDORA_VAGRANT_HOSTNAME", "claw")
$virtualBoxDescription = ENV.fetch("ISLANDORA_VAGRANT_VIRTUALBOXDESCRIPTION", "IslandoraCLAW")

Expand Down
2 changes: 1 addition & 1 deletion inventory/vagrant/group_vars/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ mysql_root_username: root
mysql_root_password: "{{ islandora_db_root_password }}"

postgresql_users:
- name: root
- name: "{{ drupal_db_user }}"
password: "{{ islandora_db_root_password }}"
db: "{{ drupal_db_name }}"

Expand Down
13 changes: 5 additions & 8 deletions inventory/vagrant/group_vars/webserver/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ drupal_composer_dependencies:
- "drupal/devel:^1.0@beta"
- "drupal/rdfui:1.x-dev"
- "drupal/restui:^1.13"
- "drupal/media_entity:^1.6"
- "drupal/media_entity_image:^1.2"
- "drupal/search_api_solr:1.0.0"
- "drupal/search_api_solr:^2.0"
- "drupal/facets:1.x-dev"
- "islandora/carapace:dev-8.x-1.x"
- "islandora/openseadragon:dev-8.x-1.x"
- "islandora/islandora_image:dev-8.x-1.x"
drupal_composer_project_package: "islandora/drupal-project:8.4"
drupal_composer_project_package: "islandora/drupal-project:8.5"
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
drupal_core_path: "{{ drupal_composer_install_dir }}/web"
drupal_db_user: drupal8
Expand All @@ -34,14 +33,12 @@ drupal_enable_modules:
- rest
- simpletest
- restui
- media_entity
- media_entity_image
- devel
- search_api
- islandora_image
- search_api_solr
- search_api_solr_defaults
- facets
- islandora_core_feature
- islandora_demo_feature
drupal_trusted_hosts:
- ^localhost$
drupal_trusted_hosts_file: "{{ drupal_core_path }}/sites/default/settings.php"
Expand Down
1 change: 1 addition & 0 deletions playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
- include: tomcat.yml
- include: crayfish.yml
- include: karaf.yml
- include: post-install.yml
10 changes: 10 additions & 0 deletions post-install.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---

- hosts: webserver
become: yes

tasks:
- name: Run migrations
command: "{{ drush_path }} -y -l localhost:{{ apache_listen_port }} mim --group=islandora"
args:
chdir: "{{ drupal_core_path }}"
4 changes: 2 additions & 2 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

- src: https://github.com/Islandora-Devops/ansible-role-alpaca
name: Islandora-Devops.alpaca
version: 0.0.1
version: 0.0.2

- src: https://github.com/Islandora-Devops/ansible-role-apix
name: Islandora-Devops.apix
Expand All @@ -59,7 +59,7 @@

- src: https://github.com/Islandora-Devops/ansible-role-crayfish
name: Islandora-Devops.crayfish
version: 0.0.1
version: 0.0.2

- src: https://github.com/Islandora-Devops/ansible-role-drupal-openseadragon
name: Islandora-Devops.drupal-openseadragon
Expand Down

This file was deleted.

5 changes: 0 additions & 5 deletions roles/internal/webserver-app/files/filehash.settings.yml

This file was deleted.

28 changes: 0 additions & 28 deletions roles/internal/webserver-app/files/rest.resource.entity.file.yml

This file was deleted.

40 changes: 0 additions & 40 deletions roles/internal/webserver-app/files/rest.resource.entity.media.yml

This file was deleted.

40 changes: 0 additions & 40 deletions roles/internal/webserver-app/files/rest.resource.entity.node.yml

This file was deleted.

21 changes: 6 additions & 15 deletions roles/internal/webserver-app/tasks/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,6 @@
owner: "{{ webserver_app_user }}"
group: "{{ webserver_app_user }}"

- name: Copy drupal config
copy:
src: "."
dest: "{{ webserver_app_drupal_config_path }}/"
mode: "0644"
owner: "{{ webserver_app_user }}"
group: "{{ webserver_app_user }}"
register: drupal_config

- name: Install config
command: "{{ drush_path }} config-import -y --partial --source={{ webserver_app_drupal_config_path }}"
args:
chdir: "{{ drupal_core_path }}"
when: drupal_config.changed is defined and drupal_config.changed

- name: Set default solr server to point to CLAW core
command: "{{ drush_path }} -y config-set search_api.server.default_solr_server backend_config.connector_config.core CLAW"
args:
Expand All @@ -98,3 +83,9 @@
with_items:
- "{{ files_to_copy.stdout_lines }}"
notify: restart solr

- name: Import features
command: "{{ drush_path }} -y fim --bundle=islandora islandora_core_feature,islandora_demo_feature"
args:
chdir: "{{ drupal_core_path }}"

0 comments on commit 364faee

Please sign in to comment.