REFERENCE.md

@@ -38,6 +38,7 @@ The following parameters are available in the `comptoir` class:
 * [`app_default_uri`](#-comptoir--app_default_uri)
 * [`app_name`](#-comptoir--app_name)
 * [`app_shortname`](#-comptoir--app_shortname)
+* [`app_session_lifetime`](#-comptoir--app_session_lifetime)
 * [`app_secret`](#-comptoir--app_secret)
 * [`config_path`](#-comptoir--config_path)
 * [`var_path`](#-comptoir--var_path)
@@ -110,6 +111,14 @@ A custom string displayed to users as short name of service.
 
 Default value: `'Comptoir'`
 
+##### <a name="-comptoir--app_session_lifetime"></a>`app_session_lifetime`
+
+Data type: `Integer`
+
+Lifetime of webapp session in seconds
+
+Default value: `3600`
+
 ##### <a name="-comptoir--app_secret"></a>`app_secret`
 
 Data type: `String[1]`

manifests/init.pp

@@ -8,6 +8,7 @@
 # @param app_default_uri Default URI used to generate URLs in a non-HTTP context
 # @param app_name A custom string displayed to users as name of service.
 # @param app_shortname A custom string displayed to users as short name of service.
+# @param app_session_lifetime Lifetime of webapp session in seconds
 # @param app_secret Application secret is required to generate CSRF tokens
 # @param config_path Directory where Comptoir-du-Libre configuration file is stored.
 # @param var_path Directory where Comptoir-du-Libre stores var files.
@@ -49,6 +50,7 @@ class comptoir (
   Stdlib::HTTPUrl $app_default_uri = 'https://comptoir.example.org/',
   String[1] $app_name = 'Comptoir-du-Libre',
   String[1] $app_shortname = 'Comptoir',
+  Integer $app_session_lifetime = 3600,
   Stdlib::Absolutepath $config_path = '/etc/comptoir',
   Stdlib::Absolutepath $var_path = '/var/comptoir',
   String[1] $trusted_hosts = $facts['networking']['fqdn'],

spec/classes/comptoir_spec.rb

@@ -30,6 +30,8 @@ describe 'comptoir' do
             .with_content(sensitive(%r{^WEBAPP_SHORTNAME='Comptoir'$}))
           is_expected.to contain_file('/etc/comptoir/env.prod.local') \
             .with_content(sensitive(%r{^WEBAPP_I18N_DEFAULT_LOCALE='en'$}))
+          is_expected.to contain_file('/etc/comptoir/env.prod.local') \
+            .with_content(sensitive(%r{^WEBAPP_SESSION_LIFETIME=3600$}))
           is_expected.to contain_file('/etc/comptoir/env.prod.local') \
             .with_content(sensitive(%r{^WEBAPP_TIMEZONE='Europe/Paris'$}))
         end
@@ -55,7 +57,7 @@ describe 'comptoir' do
         end
       end
 
-      context '/etc/comptoir/env.prod.local with custom  app_secret' do
+      context '/etc/comptoir/env.prod.local with custom app_secret' do
         let(:params) do
           {
             app_secret: 'ThisCustomTokenIsNotSoSecret',
@@ -155,6 +157,32 @@ describe 'comptoir' do
         end
       end
 
+      context '/etc/comptoir/env.prod.local with custom session lifetime (smaller than default value: 60 seconds)' do
+        let(:params) do
+          {
+            app_session_lifetime: 60,
+          }
+        end
+
+        it do
+          is_expected.to contain_file('/etc/comptoir/env.prod.local') \
+            .with_content(sensitive(%r{^WEBAPP_SESSION_LIFETIME=60$}))
+        end
+      end
+
+      context '/etc/comptoir/env.prod.local with custom session lifetime (greater than default value: 30 days)' do
+        let(:params) do
+          {
+            app_session_lifetime: 60 * 60 * 24 * 30, # 60 seconds * 60 minutes * 24 hours * 30 days = 2 592 000 seconds
+          }
+        end
+
+        it do
+          is_expected.to contain_file('/etc/comptoir/env.prod.local') \
+            .with_content(sensitive(%r{^WEBAPP_SESSION_LIFETIME=2592000$}))
+        end
+      end
+
       context '/etc/comptoir/env.prod.local with custom timezone: Pacific/Tahiti' do
         let(:params) do
           {
@@ -168,7 +196,7 @@ describe 'comptoir' do
         end
       end
 
-      context '/etc/comptoir/env.prod.local with trusted_hosts' do
+      context '/etc/comptoir/env.prod.local with custom trusted_hosts' do
         let(:params) do
           {
             trusted_hosts: '^example.org$',

templates/env.prod.local.epp

@@ -39,11 +39,11 @@ WEBAPP_EMAIL_ALERTING_TO='<%= $comptoir::smtp_mailalertingto %>'
 WEBAPP_NAME='<%= $comptoir::app_name %>'
 WEBAPP_SHORTNAME='<%= $comptoir::app_shortname %>'
 WEBAPP_I18N_DEFAULT_LOCALE='<%= $comptoir::i18ndefaultlocale %>'
+WEBAPP_SESSION_LIFETIME=<%= $comptoir::app_session_lifetime %>
 WEBAPP_TIMEZONE='<%= $comptoir::timezone %>'
 WEBAPP_TRUSTED_HOSTS='<%= $comptoir::trusted_hosts %>'
 
 ############ Environment variables not yet managed by Puppet ##########################################################
-# WEBAPP_SESSION_LIFETIME=3600
 # WEBAPP_USER_CONFIG_PASSWORD_RESET_TOKEN_LIFETIME=1200
 # WEBAPP_USER_CONFIG_MIN_PASSWORD_LENGTH=12
 # WEBAPP_SOFTWARE_VERSION_DISPLAYED_PUBLICLY=true