Skip to content
Snippets Groups Projects
Commit 1df60fea authored by McConahy, Renee Margaret's avatar McConahy, Renee Margaret
Browse files

Make minor stylistic changes.

- Vagrantfile: Correct the path to the parsed YAML file. (This caused
  'vagrant global-status' to fail when called from outside the project's
  directory.)

- Vagrantfile: As we do not use it, disable the default sharing of the
  project's directory with the VMs.

- lockss: Use /tmp as temporary directory.

- Other trivialities.
parent 187e9460
No related branches found
No related tags found
No related merge requests found
machines = YAML.safe_load File.read("vagrant-machines.yml"),
machines = YAML.safe_load File.read(__dir__ + "/vagrant-machines.yml"),
symbolize_names: true
Vagrant.configure("2") do |config|
......@@ -7,6 +7,7 @@ Vagrant.configure("2") do |config|
machine.vm.box = machine_config[:vagrant_box]
machine.vm.hostname = machine_config[:hostname]
machine.vm.network "private_network", ip: machine_config[:external_ip]
config.vm.synced_folder ".", "/vagrant", disabled: true
machine.vm.provider "virtualbox" do |vb|
vb.memory = 2048
vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ]
......
......@@ -9,9 +9,9 @@
lockss_hostname: "{{ hostname }}"
lockss_ipaddr: "{{ external_ip }}"
lockss_external_ipaddr: "{{ external_ip }}"
lockss_admin_email: root@localhost
lockss_trusted_ips:
- 192.168.0.0/16
lockss_admin_email: root@localhost
roles:
- system-update
- minimum_memory
......
......@@ -13,7 +13,7 @@
- name: Install systemd unit for local-persist.
copy:
dest: /etc/systemd/system/docker-volume-local-persist.service
src: assets/docker-volume-local-persist.service
src: files/docker-volume-local-persist.service
owner: root
mode: 0644
......
---
lockss_git_version: version-2.0-alpha
lockss_ui_user: admin
lockss_data_dir: /var/lib/lockss
......@@ -14,7 +14,7 @@
state: enabled
permanent: true
immediate: true
loop: "{{ lockss_trusted_ips }}"
loop: "{{ lockss_trusted_ips | default([]) }}"
- name: Allow management traffic from trusted zone.
firewalld:
......
......@@ -12,4 +12,4 @@
port: 24600:24699
proto: tcp
src: "{{ item }}"
loop: "{{ lockss_trusted_ips }}"
loop: "{{ lockss_trusted_ips | default([]) }}"
......@@ -137,9 +137,9 @@
LOCKSS_USER=lockss
LOCKSS_HOSTNAME={{ lockss_hostname }}
LOCKSS_IPADDR={{ lockss_ipaddr }}
LOCKSS_EXTERNAL_IPADDR={{ lockss_external_ipaddr | default }}
LOCKSS_EXTERNAL_IPADDR={{ lockss_external_ipaddr }}
LOCKSS_V3_PORT=9729
LOCKSS_ACCESS_SUBNET={{ lockss_trusted_ips | join(";") }}
LOCKSS_ACCESS_SUBNET={{ lockss_trusted_ips | default([]) | join(";") }}
LOCKSS_MAILHUB={{ lockss_mailhub_host | default("localhost") }}
LOCKSS_MAILHUB_USER={{ lockss_mailhub_user | default }}
LOCKSS_MAILHUB_PASSWORD={{ lockss_mailhub_password | default }}
......@@ -148,14 +148,14 @@
LOCKSS_PROPS_PROXY=NONE
LOCKSS_PROPS_SERVER_AUTHENTICATE_KEYSTORE=
LOCKSS_TEST_GROUP=demo
LOCKSS_DATA_DIR=/var/lib/lockss
LOCKSS_DATA_DIR={{ lockss_data_dir }}
LOCKSS_LOGS_DIR=/var/log/lockss
LOCKSS_ADMIN_USER={{ lockss_ui_user }}
LOCKSS_ADMIN_USER={{ lockss_ui_user | default("admin") }}
LOCKSS_ADMIN_PASSWD=SHA-256:{{ lockss_ui_password | hash('sha256') }}
LOCKSS_DB_PASSWD=SHA-256:{{ lockss_db_password | hash('sha256') }}
LOCKSS_PROXY_PORT=24670
LOCKSS_TMPDIR=/var/lib/lockss/tmp
LOCKSS_CLEAR_TMPDIR=yes
LOCKSS_TMPDIR=/tmp
LOCKSS_CLEAR_TMPDIR=no
- name: Add Docker secret for UI password.
vars:
......@@ -173,15 +173,12 @@
state: present
data: "{{ lockss_db_password }}"
- name: Create LOCKSS data directories.
- name: Create LOCKSS data directory.
file:
path: "{{ item }}"
path: /var/lib/lockss
state: directory
owner: lockss
mode: 0700
loop:
- /var/lib/lockss
- /var/lib/lockss/tmp
- name: Create LOCKSS log directory.
file:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment