From fabce8f9a8cb24add2b3c6223691f042725e4e35 Mon Sep 17 00:00:00 2001 From: bax1489 <fabian.gallenkamp@uni-hamburg.de> Date: Fri, 4 Oct 2019 11:51:46 +0200 Subject: [PATCH] updated documentation --- README.md | 6 +++--- group_vars/otree_servers.yml.example | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d0d203b..39a1468 100755 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ Note: Use ``scp mycert.crt user@host:/home/user/`` and ``scp mycert.key user@hos 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): ``` +[...] # fqdn of the otree parents server otree_domain: "company.org" # linux group for the otree users @@ -54,9 +55,7 @@ otree_users: override: yes # redis queue. Note don't use a slot twice, there are 16 slots available (0-15) redis: "redis://localhost:6379/1" - # which database should be used. Examples: "postgres://USER:PASSWORD@HOST:PORT/NAME" or "sqlite:////home/user/db.sqlite3" - database: "sqlite:////home/otree1/db.sqlite3" - # otree admin password + # otree admin password (also used for postgres db, don't use character "@" or ":" in it) admin_pw: "mysecretpw1" # auth level, possible values: "STUDY", "DEMO" auth_level: "STUDY" @@ -70,6 +69,7 @@ otree_users: python_binary_path: "/usr/bin/python3.7" # app git-repository (optional value) # app_repo: "https://github.com/oTree-org/oTree.git" +[...] ``` ### get the otree project on your server diff --git a/group_vars/otree_servers.yml.example b/group_vars/otree_servers.yml.example index 5670fca..6de9cc9 100755 --- a/group_vars/otree_servers.yml.example +++ b/group_vars/otree_servers.yml.example @@ -7,7 +7,7 @@ home_path: "/home" nginx_config_path: "/etc/nginx" nginx_sites_available: "{{ nginx_config_path }}/sites-available" nginx_sites_enabled: "{{ nginx_config_path }}/sites-enabled" -default_redirection: "https:// mydomain " +# default_redirection: "https:// mydomain " OPTIONAL otree_domain: "company.org" # fqdn of the otree parent domain @@ -16,16 +16,14 @@ otree_group_name: "otreeusers" otree_users: # list of users for the available otree instances - otree1: + otree: # linux username override: yes # should a existing otree environment be overriden redis: "redis://localhost:6379/1" # redis queue. Note don't use a slot twice, there are 16 slots available (0-15) - database: "sqlite:///{{ home_path }}/otree1/db.sqlite3" - # which database should be used. Examples: "postgres://USER:PASSWORD@HOST:PORT/NAME" or "sqlite:///{{ home_path }}/user/db.sqlite3" admin_pw: "mysecretpw1" - # otree admin password + # otree admin password (also used for postgres db, don't use character "@" or ":" in it) auth_level: "STUDY" # auth level, possible values: "STUDY", "DEMO" secret_key: "safaho9awefzuwf" @@ -42,9 +40,7 @@ otree_users: 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_path }/otree2/db.sqlite3" admin_pw: "mysecretpw2" auth_level: "DEMO" secret_key: "sdfunlidsgjndrsgf" -- GitLab