Commit 87d1bcc3 authored by Maciej Delmanowski's avatar Maciej Delmanowski

Merge branch 'ganto-roundcube/cleanup-1'

parents d4a6f322 1a9e007e
Pipeline #17355754 passed with stages
in 19 minutes and 5 seconds
......@@ -1016,6 +1016,25 @@ stages:
JANE_DIFF_PATTERN: '.*/debops.root_account/.*'
JANE_LOG_PATTERN: '\[debops\.root_account\]'
'roundcube role':
<<: *test_role_2nd_deps
variables:
JANE_TEST_PLAY: '${DEBOPS_PLAYBOOKS}/service/roundcube.yml'
JANE_INVENTORY_GROUPS: 'debops_service_roundcube'
JANE_DIFF_PATTERN: '.*/debops.roundcube/.*'
JANE_LOG_PATTERN: '\[debops\.roundcube\]'
'roundcube/mariadb role':
<<: *test_role_2nd_deps
variables:
JANE_TEST_PLAY: '${DEBOPS_PLAYBOOKS}/service/mariadb_server.yml ${DEBOPS_PLAYBOOKS}/service/roundcube.yml'
JANE_INVENTORY_GROUPS: 'debops_service_mariadb_server,debops_service_roundcube'
JANE_INVENTORY_HOSTVARS: 'roundcube__database=mysql-default'
JANE_DIFF_PATTERN: '.*/debops.roundcube/.*'
JANE_LOG_PATTERN: '\[debops\.roundcube\]'
VAGRANT_MASTER_MEMORY: '4096'
tags: [ 'mem-6GB' ]
'rsnapshot role':
<<: *test_role_no_deps
variables:
......
......@@ -33,3 +33,5 @@
- include: debops.yml
- include: debops_api.yml
- include: roundcube.yml
../service/roundcube.yml
\ No newline at end of file
---
- name: Manage Roundcube Web mail
- name: Install and manage Roundcube Web mail
hosts: [ 'debops_service_roundcube' ]
become: True
......@@ -11,7 +11,7 @@
roles:
- role: debops.php/env
tags: [ 'role::php', 'role::php:env' ]
tags: [ 'role::php', 'role::php:env', 'role::apt_preferences', 'role::logrotate' ]
- role: debops.apt_preferences
tags: [ 'role::apt_preferences', 'role::nginx', 'role::php' ]
......@@ -57,5 +57,5 @@
mariadb__server: '{{ roundcube__database_map[roundcube__database].dbhost }}'
when: roundcube__database_map[roundcube__database].dbtype == 'mysql'
- role: debops-contrib.roundcube
- role: debops.roundcube
tags: [ 'role::roundcube' ]
debops-contrib.roundcube - Manage Roundcube Web mail with Ansible
debops.roundcube - Manage Roundcube Web mail with Ansible
Copyright (C) 2016-2017 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
Copyright (C) 2016-2017 DebOps https://debops.org/
Copyright (C) 2016-2018 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
Copyright (C) 2016-2018 DebOps https://debops.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3, as
......
......@@ -3,11 +3,9 @@
Upgrade notes
=============
.. include:: includes/all.rst
The upgrade notes only describe necessary changes that you might need to make
to your setup in order to use a new role release. Refer to the
:ref:`roundcube__ref_changelog` for more details about what has changed.
changelog for more details about what has changed.
From v0.1.3 to v0.2.0
......@@ -49,18 +47,18 @@ defined in the example playbook.
$ debops-update
2. Make sure you have the lastest version of the debops-contrib.roundcube_
2. Make sure you have the lastest version of the :ref:`debops.roundcube`
role. In your DebOps project directory run:
.. code:: shell
$ ansible-galaxy install --force --no-deps --roles-path=ansible/roles debops-contrib.roundcube
2. Review the :ref:`roundcube__ref_changelog` and make sure your Ansible
inventory is adjusted to the variable changes (if necessary).
2. Review the changelog and make sure your Ansible inventory is adjusted to the
variable changes (if necessary).
3. Remove the nginx virtual host and PHP definitions created by the
debops.nginx_ role from the Roundcube server:
:ref:`debops.nginx` role from the Roundcube server:
.. code:: shell
......
---
# .. vim: foldmarker=[[[,]]]:foldmethod=marker
# debops-contrib.roundcube default variables [[[
# ==============================================
# debops.roundcube default variables [[[
# ======================================
# .. contents:: Sections
# :local:
#
# .. include:: includes/all.rst
# .. include:: ../../../includes/global.rst
# Packages and installation [[[
......@@ -363,8 +363,8 @@ roundcube__max_file_size: '30'
roundcube__nginx__dependent_servers:
- name: '{{ roundcube__domain }}'
filename: 'debops-contrib.roundcube'
by_role: 'debops-contrib.roundcube'
filename: 'debops.roundcube'
by_role: 'debops.roundcube'
type: 'php'
default: False
root: '{{ roundcube__git_checkout }}'
......@@ -424,7 +424,7 @@ roundcube__nginx_access_policy: ''
roundcube__nginx__dependent_upstreams:
- name: 'php_roundcube'
by_role: 'debops-contrib.roundcube'
by_role: 'debops.roundcube'
enabled: True
type: 'php'
php_pool: 'roundcube'
......@@ -444,7 +444,7 @@ roundcube__php__dependent_packages:
# PHP pools managed by the debops.php_ role.
roundcube__php__dependent_pools:
name: 'roundcube'
by_role: 'debops-contrib.roundcube'
by_role: 'debops.roundcube'
user: '{{ roundcube__user }}'
group: '{{ roundcube__group }}'
......
Copyright
=========
.. literalinclude:: ../COPYRIGHT
Introduction
============
This `Ansible`_ role allows you to install and manage `Roundcube`_, a
IMAP Web client written in PHP.
.. _Ansible: https://ansible.com/
.. _Roundcube: http://roundcube.net/
Installation
~~~~~~~~~~~~
This role requires at least Ansible ``v2.3.0``. To install it, run:
.. code-block:: console
ansible-galaxy install debops-contrib.roundcube
..
Local Variables:
mode: rst
ispell-local-dictionary: "american"
End:
......@@ -31,7 +31,7 @@
register: roundcube__register_cloned
- name: Save current checkout hash for update
shell: git rev-parse HEAD
command: git rev-parse HEAD
args:
chdir: '{{ roundcube__git_dest }}'
become_user: '{{ roundcube__user }}'
......@@ -40,7 +40,7 @@
when: roundcube__register_cloned.stat.exists
- name: Change current HEAD to master in bare repository for update
shell: git symbolic-ref HEAD refs/heads/master
command: git symbolic-ref HEAD refs/heads/master
args:
chdir: '{{ roundcube__git_dest }}'
become_user: '{{ roundcube__user }}'
......
......@@ -3,12 +3,11 @@
Getting started
===============
.. include:: ../../../includes/global.rst
.. contents::
:local:
.. include:: includes/all.rst
.. _roundcube__ref_default_setup:
Default setup
......@@ -25,8 +24,10 @@ SQLite is used as database backend for storing the user settings.
Example inventory
-----------------
Roundcube can be installed on a given host by adding it to the
``[debops_service_roundcube]`` Ansible inventory group::
To install and configure Roundcube on a host, it needs to be present in the
``[debops_service_roundcube]`` Ansible inventory group:
.. code-block:: none
[debops_service_roundcube]
hostname
......@@ -40,10 +41,10 @@ Example playbook
The following playbook can be used with DebOps. If you are using these role
without DebOps you might need to adapt them to make them work in your setup.
.. literalinclude:: playbooks/roundcube.yml
.. literalinclude:: ../../../../ansible/playbooks/service/roundcube.yml
:language: yaml
This playbook is also shipped with the role under :file:`docs/playbooks/`.
This playbook is also shipped with DebOps at :file:`ansible/playbooks/service/roundcube.yml`.
.. _roundcube__ref_ansible_tags:
......
.. _debops-contrib.roundcube:
.. _debops.roundcube:
Ansible role: debops-contrib.roundcube
======================================
debops.roundcube
================
The ``debops.roundcube`` Ansible role manages `Roundcube`__, an IMAP Web client
written in PHP.
.. __: https://roundcube.net/
.. toctree::
:maxdepth: 2
introduction
getting-started
defaults
guides
copyright
changelog
upgrade
Copyright
---------
.. literalinclude:: ../../../../ansible/roles/debops.roundcube/COPYRIGHT
..
Local Variables:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment