From 049716ddf2ad6f425bedba7f5ede3540212f687a Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 7 Sep 2015 16:08:11 +0200 Subject: [PATCH] d4science-gcube/group_vars/redmine/all.yml: install the wiki-external plugin. library/roles/redmine/defaults/main.yml: manage the wiki-external plugin. library/roles/ubuntu-deb-general/tasks/manage_su_limits.yml: Change the pam su configuration to load pam_limits. --- redmine/defaults/main.yml | 15 ++++++++------- redmine/tasks/redmine-plugins.yml | 5 +++++ ubuntu-deb-general/tasks/main.yml | 2 ++ ubuntu-deb-general/tasks/manage_su_limits.yml | 4 ++++ 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 ubuntu-deb-general/tasks/manage_su_limits.yml diff --git a/redmine/defaults/main.yml b/redmine/defaults/main.yml index 91bcf443..6dd83ce1 100644 --- a/redmine/defaults/main.yml +++ b/redmine/defaults/main.yml @@ -3,17 +3,17 @@ # Note: this plugin depends on apache. It's not usable with nginx yet # redmine_version: 2.5.2 -redmine_inst_name: nemis -redmine_main_project: nemis -redmine_db_user: redm_nemis -redmine_db_name: redm_nemis +redmine_inst_name: redmine +redmine_main_project: redmine +redmine_db_user: redm_db_user +redmine_db_name: redm_db_name redmine_db_host: localhost # The commented variables need to be set on the playbooks #redmine_glob_root_dir: /srv/redmine # It is a redmine_glob_root_dir subdirectory -redmine_inst_dir: nemis -redmine_user: nemis -redmine_group: nemis +redmine_inst_dir: redmine +redmine_user: redmine +redmine_group: redmine redmine_glob_user: www-data redmine_glob_group: www-data @@ -45,6 +45,7 @@ rm_unreadissues_plugin: False rm_usability_plugin: False rm_mylynconnector_plugin: False rm_addsubversionlinks_plugin: False +rm_wiki_external_plugin: False # # IMPORTANT: these are mutually exclusive. One of the two needs to be set to True ruby_use_mod_passenger: True diff --git a/redmine/tasks/redmine-plugins.yml b/redmine/tasks/redmine-plugins.yml index 6437be59..88e2fe38 100644 --- a/redmine/tasks/redmine-plugins.yml +++ b/redmine/tasks/redmine-plugins.yml @@ -383,4 +383,9 @@ - redmine_plugins - redmine_plugins_mentions +- name: Install the external wiki plugin + git: repo=https://github.com/nutso/redmine-plugin-wiki-external.git dest={{ redmine_glob_root_dir }}/{{ redmine_inst_dir }}/plugins/wiki_external update=no + when: rm_wiki_external_plugin + notify: Bundle install and reconfigure redmine + tags: [ 'redmine', 'redmine_plugins', 'redmine_plugins_wiki_external' ] diff --git a/ubuntu-deb-general/tasks/main.yml b/ubuntu-deb-general/tasks/main.yml index ade07398..fb2f15a7 100644 --- a/ubuntu-deb-general/tasks/main.yml +++ b/ubuntu-deb-general/tasks/main.yml @@ -21,4 +21,6 @@ when: is_precise and ansible_kernel != "3.2.0-4-amd64" - include: unattended-upgrades.yml - include: install_external_ca_cert.yml +- include: manage_su_limits.yml + diff --git a/ubuntu-deb-general/tasks/manage_su_limits.yml b/ubuntu-deb-general/tasks/manage_su_limits.yml new file mode 100644 index 00000000..bd2d774d --- /dev/null +++ b/ubuntu-deb-general/tasks/manage_su_limits.yml @@ -0,0 +1,4 @@ +--- +- name: Fix debian/ubuntu broke behaviour. The su pam config does not load pam_limits + lineinfile: dest=/etc/pam.d/su line="session required pam_limits.so" insertafter="^#\ \(Replaces\ the\ use\ of\ /etc/limits.*$" + tags: [ 'su', 'pam_limits']