From e225411614fd90b1fea125d50c86145dc3be9c08 Mon Sep 17 00:00:00 2001 From: Eli Zoller Date: Tue, 25 Aug 2020 13:32:15 -0700 Subject: [PATCH] update config for staging env --- inventory/stage/group_vars/crayfish.yml | 3 +- inventory/stage/group_vars/karaf.yml | 1 + inventory/stage/group_vars/tomcat.yml | 6 +++- .../stage/group_vars/webserver/apache.yml | 19 +++++++++++ .../stage/group_vars/webserver/drupal.yml | 6 ++-- .../stage/group_vars/webserver/general.yml | 34 +++++++++++++++++-- inventory/stage/hosts | 6 ++-- 7 files changed, 65 insertions(+), 10 deletions(-) diff --git a/inventory/stage/group_vars/crayfish.yml b/inventory/stage/group_vars/crayfish.yml index b7dff885..46d71d64 100644 --- a/inventory/stage/group_vars/crayfish.yml +++ b/inventory/stage/group_vars/crayfish.yml @@ -3,5 +3,6 @@ crayfish_version_tag: dev crayfish_db: mysql crayfish_fedora_base_url: "http://35.166.140.245:8080/fcrepo/rest" -crayfish_drupal_base_url: "http://35.163.77.215" +# crayfish_drupal_base_url: "http://35.163.77.215" +crayfish_drupal_base_url: "http://repo-dev.aws.lib.asu.edu" crayfish_gemini_base_url: "http://35.166.140.245/gemini" diff --git a/inventory/stage/group_vars/karaf.yml b/inventory/stage/group_vars/karaf.yml index 6e5c2ab2..4c95509c 100644 --- a/inventory/stage/group_vars/karaf.yml +++ b/inventory/stage/group_vars/karaf.yml @@ -16,4 +16,5 @@ alpaca_gemini_base_url: http://35.166.140.245/gemini/ alpaca_houdini_base_url: "http://35.166.140.245/houdini" alpaca_homarus_base_url: "http://35.166.140.245/homarus" + alpaca_fits_base_url: "http://35.166.140.245/crayfits" tomcat8_home: /var/lib/tomcat8 diff --git a/inventory/stage/group_vars/tomcat.yml b/inventory/stage/group_vars/tomcat.yml index a0c7a003..72143291 100644 --- a/inventory/stage/group_vars/tomcat.yml +++ b/inventory/stage/group_vars/tomcat.yml @@ -5,6 +5,10 @@ tomcat8_users: password: "{{ islandora_tomcat_password }}" roles: - manager-gui +fcrepo_home_dir: /opt/fcrepo +fcrepo_config_dir: "{{ fcrepo_home_dir }}/configs" +fcrepo_allowed_external_content_file: "{{ fcrepo_config_dir }}/allowed-external-content.txt" +blazegraph_home_dir: /opt/blazegraph # For production use either "jdbc-mysql" or "jdbc-postgresql" #fcrepo_persistence: file-simple @@ -57,7 +61,7 @@ fcrepo_syn_sites: anonymous: true default: true path: "{{ fcrepo_syn_default_public_key_path }}" - url: https://35.163/77.215 + url: "http://repo-dev.aws.lib.asu.edu" fcrepo_syn_tokens: - user: admin diff --git a/inventory/stage/group_vars/webserver/apache.yml b/inventory/stage/group_vars/webserver/apache.yml index 666dd8b1..7b0057c8 100644 --- a/inventory/stage/group_vars/webserver/apache.yml +++ b/inventory/stage/group_vars/webserver/apache.yml @@ -9,3 +9,22 @@ apache_vhosts: documentroot: "/var/www/html/drupal/web" allow_override: All options: -Indexes +FollowSymLinks +apache_mods_enabled: + - rewrite.load + - ssl.load +apache_vhosts_ssl: + - servername: repo-dev.aws.lib.asu.edu + documentroot: "/var/www/html/drupal/web" + certificate_file: "/etc/ssl/private/__lib_asu_edu.cer" + certificate_key_file: "/etc/ssl/private/__lib_asu_edu.key" + extra_parameters: | + RewriteEngine On + RewriteCond %{HTTPS} !=on + RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] + +apache_allow_override: "All" +apache_options: "-Indexes +FollowSymLinks" + +# RewriteCond %{HTTP_HOST} !^www\. [NC] +# RewriteRule ^(.*)$ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L] + diff --git a/inventory/stage/group_vars/webserver/drupal.yml b/inventory/stage/group_vars/webserver/drupal.yml index 6c108a56..dd224972 100644 --- a/inventory/stage/group_vars/webserver/drupal.yml +++ b/inventory/stage/group_vars/webserver/drupal.yml @@ -50,9 +50,9 @@ drupal_composer_project_package: "islandora/drupal-project:8.8.1" drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction" drupal_core_path: "{{ drupal_composer_install_dir }}/web" drupal_db_user: drupal8 -drupal_db_name: drupal8 +drupal_db_name: drupal8v2 drupal_db_backend: "{{ claw_db }}" -drupal_db_host: "islandora-drupal.cvznsvixsvec.us-west-2.rds.amazonaws.com" +drupal_db_host: "islandora-drupal2.cvznsvixsvec.us-west-2.rds.amazonaws.com" drupal_domain: "claw.dev" drupal_site_name: "Islandora 8" drupal_install_profile: standard @@ -103,7 +103,7 @@ drupal_enable_modules: - simple_sitemap - auto_entitylabel - migrate_file - - group + # - group - islandora_search - smtp drupal_trusted_hosts: diff --git a/inventory/stage/group_vars/webserver/general.yml b/inventory/stage/group_vars/webserver/general.yml index 951cc745..12bb752a 100644 --- a/inventory/stage/group_vars/webserver/general.yml +++ b/inventory/stage/group_vars/webserver/general.yml @@ -4,8 +4,8 @@ webserver_app: yes openseadragon_iiiv_set_var: yes openseadragon_iiiv_server: "http://{{ hostvars[groups['tomcat'][0]].ansible_host }}:8080/cantaloupe/iiif/2" -drupal_owner: www-data -drupal_group: www-data +drupal_owner: ubuntu +drupal_group: ubuntu php_post_max_size: "64M" drupal_composer_project_package: "islandora/drupal-project:8.8.1" @@ -26,3 +26,33 @@ cantaloupe_cache_source: FilesystemCache cantaloupe_cache_derivative: FilesystemCache cantaloupe_create_FilesystemCache_dir: yes cantaloupe_resolver_static: HttpResolver + +apache_listen_port: 80 +apache_create_vhosts: true +apache_vhosts_filename: "islandora.conf" +apache_remove_default_vhost: true +apache_vhosts: + - servername: "repo-dev.aws.lib.asu.edu" + documentroot: "/var/www/html/drupal/web" + allow_override: All + options: -Indexes +FollowSymLinks +apache_mods_enabled: + - rewrite.load + - ssl.load +apache_vhosts_ssl: + - servername: repo-dev.aws.lib.asu.edu + documentroot: "/var/www/html/drupal/web" + certificate_file: "/etc/ssl/private/__lib_asu_edu.cer" + certificate_key_file: "/etc/ssl/private/__lib_asu_edu.key" + extra_parameters: | + RewriteEngine On + RewriteCond %{HTTPS} !=on + RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] + +apache_allow_override: "All" +apache_options: "-Indexes +FollowSymLinks" + +# RewriteCond %{HTTP_HOST} !^www\. [NC] +# RewriteRule ^(.*)$ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L] + + \ No newline at end of file diff --git a/inventory/stage/hosts b/inventory/stage/hosts index 09c2bd88..9ddc2f2d 100644 --- a/inventory/stage/hosts +++ b/inventory/stage/hosts @@ -1,14 +1,14 @@ -webserver ansible_host=35.163.77.215 ansible_user=ubuntu ansible_ssh_port=22 ansible_ssh_private_key_file='~/.ssh/Islandora-Dev.pem' +weby ansible_host=10.192.33.136 ansible_user=ubuntu ansible_ssh_port=22 ansible_ssh_private_key_file='~/.ssh/Islandora-Dev.pem' services ansible_host=35.166.140.245 ansible_user=ubuntu ansible_ssh_port=22 ansible_ssh_private_key_file='~/.ssh/Islandora-Dev.pem' [karaf] services [database] -default +weby [webserver] -default +weby [tomcat] services