gdcc · jmjamison · Jul 19, 2024 · Jul 26, 2024 · Sep 12, 2024 · Sep 12, 2024
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,37 @@ venv
 .vagrant/
 /.idea
 /*.iml
+inventory_ec2
+.DS_Store
+
+
+### ucla local 
+
+# Conda environment artifacts
+.env/
+.venv/
+conda-meta/
+*.conda
+*.egg-info/
+
+# Python bytecode
+__pycache__/
+*.py[cod]
+*.pyo
+
+# Pip-tools generated lockfile (optional to ignore)
+# If you want reproducibility, keep this file checked in.
+# If you want to force all devs to recompile, uncomment below:
+# requirements.txt
+
+# pip-sync temporary install log
+pip-log.txt
+
+# Molecule test artifacts
+.molecule/
+*.retry
+*.log
+
+# VSCode & Editor configs
+.vscode/
+.idea/
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ The role installs Apache, PostgreSQL, GlassFish/Payara and other prerequisites,
 
 Running the following commands as root should install the latest released version of Dataverse.
 
-	$ git clone https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible.git dataverse
+	$ git clone https://github.com/ucla-data-science-center/dataverse-ansible.git dataverse
 	$ ansible-playbook --connection=local -v -i dataverse/inventory dataverse/dataverse.pb -e "@dataverse/defaults/main.yml"
 
 Recent, specific versions of Dataverse (namely, 4.20 and 5.0) may be installed using branches tagged with that version.
@@ -89,8 +89,8 @@ It is possible to run certain portions of the playbook to avoid running the enti
 **Note:** While Ansible in general strives to achieve role idempotence, the dataverse-ansible role is merely a wrapper for the Dataverse installer, which itself is not idempotent. If you strongly desire that the role be idempotent and would like achieve this via semaphores, pull requests are welcome!
 
 ### To test using Vagrant:
-	$ git clone https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible
-	$ cd dataverse-ansible
+	$ git clone https://github.com/ucla-data-science-center/dataverse-ansible.git ucla-dataverse
+	$ cd ucla-dataverse
 	$ vagrant up
 
 On successful completion of the Vagrant run, you should be able to log in to your test Dataverse as dataverseAdmin using the dataverse_adminpass from tests/group_vars/vagrant.yml using the address:

diff --git a/Vagrantfile b/Vagrantfile
@@ -4,8 +4,9 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "bento/rockylinux-9"
-
+  #config.vm.box = "bento/rockylinux-9"
+  config.vm.box = "bento/rockylinux-9-arm64"
+
   config.vm.synced_folder ".", "/vagrant"
   config.vm.synced_folder ".", "/etc/ansible/roles/dataverse"
 
@@ -20,7 +21,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 9090, host: 9090, auto_correct: true # Prometheus
 
   config.vm.provision :ansible_local do |ansible|
-    ansible.playbook = "tests/site.yml"
+    ansible.playbook = "site.yml"
     ansible.groups = {
       "dataverse" => %(default),
       "db"        => %(default),
@@ -34,8 +35,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     ansible.verbose = true
   end
 
-  config.vm.provider "virtualbox" do |vbox|
-    vbox.cpus = 4
-    vbox.memory = 8192
+  config.vm.provider "vmware_desktop" do |vmware|
+    vmware.vmx["tools.upgrade.policy"] = "manual"
+    vmware.gui = false
+    vmware.ssh_info_public = true
+    vmware.allowlist_verified = true
+    vmware.linked_clone = false
+    vmware.vmx["ethernet0.virtualdev"] = "vmxnet3"
+    vmware.vmx["ethernet1.virtualdev"] = "vmxnet3"
+    vmware.vmx["memsize"] = "8192"
+    vmware.vmx["numvcpus"] = "4"
   end
-end
+end
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -8,7 +8,7 @@ dataverse_repo: https://github.com/IQSS/dataverse.git
 # dataverse_installer_url: https://example.com/path/to/dvinstall.zip
 
 # set this to true for troubleshooting
-any_errors_fatal: false
+#any_errors_fatal: true
 
 apache:
   enabled: true
@@ -51,17 +51,17 @@ dataverse:
   adminpass: admin1
   allow_signups: true
   api:
-    allow_lookup: false
-    blocked_endpoints: "admin,builtin-users,test"
-    blocked_policy: "localhost-only"
+    allow_lookup: true
+    blocked_endpoints: "builtin-users,test"
+    blocked_policy: ""
     location: "http://localhost:8080/api"
     test_suite: false
     # possible test values from https://github.com/IQSS/dataverse/blob/develop/conf/docker-aio/run-test-suite.sh#L11
     # beware DataversesIT and DatasetsIT at minimum must be run for any other tests to succeed. have fun.
     #tests: "DataversesIT,DatasetsIT,AdminIT"
     tests: default
   branding:
-    enabled: false
+    enabled: true
     directory: "{{ playbook_dir }}/files/branding"
     favicons_directory: "{{ playbook_dir }}/files/favicons"
     fileSettings:
@@ -70,23 +70,23 @@ dataverse:
      - setting: StyleCustomizationFile
        file: custom-stylesheet.css
      - setting: LogoCustomizationFile
-       file: topbanner001w425_darkbg.png'
+       file: dataverseUCLA_logo.png
     otherSettings:
      - setting: FooterCopyright
-       value: Your institute name here
+       value: " UC Regents"
   language:
-    enabled: false # setting this to true allows the language task to run
+    enabled: true # setting this to true allows the language task to run
     languages:
      - locale: en_US
        title: English
-     - locale: de_DE
-       title: Deutsch
+     - locale: de_ES
+       title: Spanish
     language_packs:
       source: https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs.git
       version: develop
     lang_directory: "{{ dataverse_misc_files_dir }}/lang"
   licenses:
-    enabled: false
+    enabled: true
     user: dataverseAdmin
     licenses:
      - name: CC0 1.0
@@ -131,9 +131,9 @@ dataverse:
        iconUrl: https://licensebuttons.net/l/by-sa/4.0/88x31.png
        active: true
        sortOrder: 7
-  copyright: "Your Institution"
+  copyright: "UC Regents"
   counter:
-    enabled: false
+    enabled: true
     #geoipdir: maxmind_geoip
     #geoipfile: GeoLite2-Country.mmdb
     hub_api_token: set_me_in_secrets
@@ -149,7 +149,7 @@ dataverse:
     user: counter
     year_month: "2018-05"
   custom_metadata_blocks:
-    enabled: false
+    enabled: true
     urls:
       - https://github.com/IQSS/dataverse/files/3744336/codemeta.tsv.txt
   default:
@@ -247,7 +247,7 @@ dataverse:
     custom_sampledataverses: "{{ playbook_dir }}/custom_sampledata/dataverses"
     custom_sampleusers: "{{ playbook_dir }}/custom_sampledata/users"
     custom_samplefiles: "{{ playbook_dir }}/custom_sampledata/files"
-  service_email: noreply@dataverse.yourinstitution.edu
+  service_email: noreply@dataverse.ucla.edu
   smtp: localhost # or the FQDN of your organization's SMTP relay
   solr:
     download_url: https://archive.apache.org/dist/solr/solr/9.8.0/solr-9.8.0.tgz
@@ -327,7 +327,7 @@ localstack:
   web_ui: 8888
   buckets:
     - label: LocalStack
-      id: localstack1
+      id: loalstack1
       bucket_name: mybucket
       enabled: false
       access_key: 4cc355_k3y
@@ -416,7 +416,8 @@ s3:
   label: s3-test
   # for localstack this must be true
   path_style_access: true
-  region: us-east-1
+  region: us-west-2
+  location_constraint: us-west-2
   storage_driver_id: s3
   url_expiration_minutes: 60
   payload_signing: false

diff --git a/environment.yml b/environment.yml
@@ -0,0 +1,7 @@
+name: dataverse-ansible
+channels:
+  - conda-forge
+dependencies:
+  - python=3.11
+  - pip
+  - pip-tools
diff --git a/files/branding/custom-header.html b/files/branding/custom-header.html
@@ -0,0 +1,35 @@
+    <style>
+        /* NOTE: You can use the custom CSS configuration to move this CSS your own stylesheet... */
+
+        /* Overwrite default navbar styles to make room at the top of the browser page for our custom header... */
+        .navbar-fixed-top {
+            top:50px !important;
+        }
+        #dataverse-header-block {
+            padding-top: 100px;
+        }
+
+	/* Place narrow custom header at the top of the page... */
+        #custom-header {
+            background: #414141;
+            min-height: 44px;
+            position: fixed;
+            right: 0;
+            left: 0;
+            z-index: 930;
+            padding-top: 8px;
+        }
+        #custom-header a.cst-hdr-link {
+            line-height: 32px;
+            color: #BAC5C6;
+            font-weight: bold;
+        }
+    </style>
+    <div id="custom-header">
+        <div class="container">
+            <p class="text-right">
+                <a class="pull-left" href="https://dataverse.org" title="SAMPLE IMAGE LINK" target="_blank"><img src="/var/www/dataverse/branding/sample.png" alt="SAMPLE IMAGE"/></a>
+                <a class="cst-hdr-link" href="https://dataverse.org" title="SAMPLE HEADER LINK" target="_blank">SAMPLE HEADER LINK</a>
+            </p>
+        </div>
+    </div>
diff --git a/files/branding/dataverseUCLA_logo.png b/files/branding/dataverseUCLA_logo.png
diff --git a/files/branding/dataverseUCLA_logo2.png b/files/branding/dataverseUCLA_logo2.png
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -0,0 +1,2 @@
+dataverse_system_email: "[email protected]"
+
diff --git a/inventory b/inventory
@@ -1,2 +1,2 @@
 [dataverse]
-localhost
+rocky9 ansible_connection=docker
diff --git a/meta/main.yml b/meta/main.yml
@@ -11,3 +11,5 @@ galaxy_info:
         - 7
   galaxy_tags:
     - dataverse
+  role_name: dataverse
+  namespace: ucla-data-science-center
diff --git a/molecule/rocky9/Dockerfile.j2 b/molecule/rocky9/Dockerfile.j2
@@ -0,0 +1,3 @@
+FROM rockylinux:9
+RUN yum install -y sudo systemd systemd-sysv postfix
+CMD ["/usr/sbin/init"]
diff --git a/molecule/rocky9/converge.yml b/molecule/rocky9/converge.yml
@@ -0,0 +1,8 @@
+---
+- name: Converge
+  hosts: all
+  gather_facts: false
+  tasks:
+    - name: Replace this task with one that validates your content
+      ansible.builtin.debug:
+        msg: "This is the effective test"
diff --git a/molecule/rocky9/molecule.yml b/molecule/rocky9/molecule.yml
@@ -0,0 +1,34 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: rocky9
+    image: eniocarboni/docker-rockylinux-systemd:latest
+    pre_build_image: true
+    privileged: true
+    command: /usr/sbin/init
+    groups:
+      - dataverse
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+      - /var/lib/containerd
+    cgroupns_mode: host
+    published_ports: 
+      - "8080:8080"
+# gpt lies! 
+#    ports:
+#      - "8080:8080"
+provisioner:
+  name: ansible
+  log: true  # Enable logging
+  config_options:
+    defaults:
+      log_path: ./ansible-output.log  # Path where the log will be saved
+  roles_path:
+    - ..
+  playbooks:
+    converge: ../../site.yml
+verifier:
+  name: testinfra
diff --git a/requirements.in b/requirements.in
@@ -0,0 +1,4 @@
+ansible-core
+molecule
+molecule-docker
+docker