diff --git a/README.md b/README.md index 8bfa294da763c53faedc3d69cd35686f22274205..988522e389c230cfbabcb8841400bed9464ad8a1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## preparation -### place ssl/tls certificates and key-file (unfortunately not scriptable due to security best-practices) +### place ssl/tls certificate and key-file (unfortunately not scriptable due to security best-practices) 1. Use ``scp mycert.crt user@host:/home/user/`` and ``scp mycert.key user@host:/home/user/`` or use [WinSCP](https://de.wikipedia.org/wiki/WinSCP) to copy over the certificate files. 2. Establish a ssh connection onto your server. 3. Then move the certificate files into place: @@ -30,18 +30,16 @@ 3. Then clone this ansible project: -``git clone https://gitlab.rrz.uni-hamburg.de/bax1489/otree-ansible.git ~/otree-ansible/`` +``git clone https://gitlab.rrz.uni-hamburg.de/bax1489/otree-ansible.git /opt/otree/otree-ansible/`` ### configure playbook -1. Copy the example config ``cp ~/otree-ansible/group_vars/otree_servers.yml.example ~/otree-ansible/group_vars/otree_servers.yml`` +1. Copy the example config ``cp /opt/otree/otree-ansible/group_vars/otree_servers.yml.example /opt/otree/otree-ansible/group_vars/otree_servers.yml`` -2. Adapt your (inventory-)config with ``nano ~/otree-ansible/group_vars/otree_servers.yml`` from the provided example accordingly (press "Strg-x", then "j" to save): +2. Adapt your (inventory-)config with ``nano /opt/otree/otree-ansible/group_vars/otree_servers.yml`` from the provided example accordingly (press "Strg-x", then "j" to save): ``` -# which otree instance should be delivered as default -otree_master: "otree1" -# fqdn of the otree server -otree_domain: "otree.company.org" +# fqdn of the otree parents server +otree_domain: "company.org" # linux group for the otree users otree_group_name: "otreeusers" diff --git a/group_vars/otree_servers.yml.example b/group_vars/otree_servers.yml.example index 9396cfa88f3ab2132830dd654d15ab7f43354018..65411110a2d6f0e969cd0230af339d6be6fc7136 100644 --- a/group_vars/otree_servers.yml.example +++ b/group_vars/otree_servers.yml.example @@ -1,17 +1,14 @@ --- ansible_user: "mylinuxuser" -ansible_password: "mysecretpw" -ansible_sudo_pass: "mysecretpw" +ansible_become_pass: "mysecretpw" ansible_connection: "local" nginx_config_path: "/etc/nginx" nginx_sites_available: "{{ nginx_config_path }}/sites-available" nginx_sites_enabled: "{{ nginx_config_path }}/sites-enabled" -otree_master: "otree1" -# which otree instance should be delivered as default -otree_domain: "otree.company.org" -# fqdn of the otree server +otree_domain: "company.org" +# fqdn of the otree parent domain otree_group_name: "otreeusers" # linux group for the otree users @@ -42,6 +39,7 @@ otree_users: override: no app_repo: "https://github.com/oTree-org/oTree.git" # optional: if set clone provided git repository instead of provided directory + # for ssh: git@domain:project-group/project.git pre_release: yes redis: "redis://localhost:6379/2" database: "sqlite:////home/otree2/db.sqlite3"