From 58207f2bbfd26999ac23a641f4e1a434b1a3b393 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Thu, 20 May 2021 10:27:31 +0200 Subject: [PATCH] Make session-timeout-minutes configurable --- README.md | 3 ++- defaults/main.yml | 2 +- templates/etc/rstudio/rserver.conf.j2 | 2 +- templates/etc/rstudio/rsession.conf.j2 | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ddf7969..1ef1b32 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,14 @@ Set up (the latest version of) [RStudio Server](https://www.rstudio.com/products #### Variables -* `rstudio_server_version` [default: `1.4.1106`, `1.2.5042` for `Debian 8`]: Version to install +* `rstudio_server_version` [default: `1.4.1717`, `1.2.5042` for `Debian 8`]: Version to install * `rstudio_server_install` [default: `[]`]: Additional packages to install (e.g. `r-base`) * `rstudio_server_www_port` [default: `8787`]: The port you want RStudio to listen on * `rstudio_server_www_address` [default: `0.0.0.0`]: The address you want RStudio to listen on * `rstudio_server_auth_required_user_group` [optional]: Limits the users who can login to RStudio to the members of a this group (e.g. `rstudio_users`) * `rstudio_server_which_r` [optional]: Override which version of R is used +* `rstudio_server_session_timeout_minutes` [optional]: Session timeout (e.g. `0`, no timeout) ## Dependencies diff --git a/defaults/main.yml b/defaults/main.yml index 5502faa..5fe0f6e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ # defaults file --- -rstudio_server_version: "{{ '1.2.5042' if ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '<') else '1.4.1106' }}" +rstudio_server_version: "{{ '1.2.5042' if ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '<') else '1.4.1717' }}" rstudio_server_install: [] rstudio_server_www_port: 8787 diff --git a/templates/etc/rstudio/rserver.conf.j2 b/templates/etc/rstudio/rserver.conf.j2 index 769fae9..f185bde 100644 --- a/templates/etc/rstudio/rserver.conf.j2 +++ b/templates/etc/rstudio/rserver.conf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} # Server Configuration File diff --git a/templates/etc/rstudio/rsession.conf.j2 b/templates/etc/rstudio/rsession.conf.j2 index d8192b2..9632685 100644 --- a/templates/etc/rstudio/rsession.conf.j2 +++ b/templates/etc/rstudio/rsession.conf.j2 @@ -1,3 +1,6 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} # R Session Configuration File +{% if rstudio_server_session_timeout_minutes is defined %} +session-timeout-minutes={{ rstudio_server_session_timeout_minutes }} +{% endif %}