diff --git a/doc/vm_support.md b/doc/vm_support.md index 5eba0e4..845b916 100644 --- a/doc/vm_support.md +++ b/doc/vm_support.md @@ -14,23 +14,22 @@ VMs based on Qemu/KVM in school network. Repository with ansible-playbook for seedbox install: https://codeberg.org/digitalsouveraeneschule/... * `seedbox`-hostname must be resolvable via DNS -## Activation / Default - -### To enable VM support: - -``` -vm_support: true -``` - -Default: `vm_support: false - -### Torrent Server -``` -vm_torrent_srv: "myseedbox.linuxmuster.net" -``` - -Default: `vm_torrent_srv: "seedbox.{{ domain }}"` +## Configuration / Variables + * **vm_support** + This flag indicates whether to activate VM support. + Type: *Boolean* + Values: + * `false` <-- (default) + * `true` + * **vm_torrent_serv** + Name of the torrent server. + Type: *String* + Default: `vm_torrent_serv: "seedbox.{{ domain }}"` + * **vm_uploadseed_pwd** + Password for upload-seed. Used for image upload to torrent-server. + Type: *String* + Default: `secret = "token:topsecret"` ## Example @@ -41,5 +40,5 @@ inventory.yml all: vars: vm_support: true - vm_torrent_srv: "myseedbox.linuxmuster.net" # default: seedbox.{{ domain }} + vm_torrent_serv: "myseedbox.linuxmuster.net" # default: seedbox.{{ domain }} ``` diff --git a/roles/lmn_vm/defaults/main.yml b/roles/lmn_vm/defaults/main.yml index 60e26db..11c04c0 100644 --- a/roles/lmn_vm/defaults/main.yml +++ b/roles/lmn_vm/defaults/main.yml @@ -1,3 +1,4 @@ --- vm_support: false -vm_torrent_srv: "seedbox.{{ domain }}" +vm_torrent_serv: "seedbox.{{ domain }}" +vm_uploadseed_pwd: secret = "token:topsecret" diff --git a/roles/lmn_vm/tasks/main.yml b/roles/lmn_vm/tasks/main.yml index 0993d41..a39325a 100644 --- a/roles/lmn_vm/tasks/main.yml +++ b/roles/lmn_vm/tasks/main.yml @@ -169,7 +169,7 @@ group: lmnsynci mode: '0640' content: | - {{ uploadseed_pwd }} + {{ vm_uploadseed_pwd }} - name: Prepare directory for aria2 dht.dat ansible.builtin.file: diff --git a/roles/lmn_vm/templates/vm.conf.j2 b/roles/lmn_vm/templates/vm.conf.j2 index b9cf38c..7f69a21 100644 --- a/roles/lmn_vm/templates/vm.conf.j2 +++ b/roles/lmn_vm/templates/vm.conf.j2 @@ -1,6 +1,6 @@ # variables for LMN VM submodule -SEEDBOX_HOST="{{ vm_torrent_srv }}" +SEEDBOX_HOST="{{ vm_torrent_serv }}" SEEDBOX_PORT=6789 SEEDBOX_RPC_PORT=6800 SEEDBOX_PWFILE="/etc/lmn/uploadseed.conf"