From b453b7fcb1899ba476541d9449d01ecdc24e08fd 2015-04-27 20:08:54 From: Branko Majic Date: 2015-04-27 20:08:54 Subject: [PATCH] MAR-13: Don't use Wheezy backports repository for deploying mail server. Updated package name for Emacs. --- diff --git a/docs/rolereference.rst b/docs/rolereference.rst index c4b705d2899738fd615768cf0d25828de4e3841d..c4af2d60f6a99b927aebdce5a01750027a1353cb 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -631,10 +631,8 @@ Postfix is used SMTP, while Dovecot is used for IMAP. The role implements the following: * Installs rsync. -* Adds the Wheezy backports repository. * Deploys IMAP/SMTP TLS private keys and certificates. -* Installs and configures Dovecot (from backports), Postfix, ClamAV, and ClamAV - Milter. +* Installs and configures Dovecot, Postfix, ClamAV, and ClamAV Milter. * Purges Exim4 configuration (just in case). * Installs SWAKS (utility for testing SMTP servers). * Sets-up the necessary directories and files under Postfix chroot. diff --git a/roles/mail_server/tasks/main.yml b/roles/mail_server/tasks/main.yml index fe6d1e0e73e65509192b01f58f96ef006804e4e1..ebdf17b634a4e0d49b06450cb6f0722c22622802 100644 --- a/roles/mail_server/tasks/main.yml +++ b/roles/mail_server/tasks/main.yml @@ -3,11 +3,8 @@ - name: Install rsync apt: name="rsync" state=installed -- name: Add backports repository - apt_repository: repo="deb http://http.debian.net/debian wheezy-backports main" state=present - - name: Install Dovecot packages - apt: name="{{ item }}" state=installed default_release="wheezy-backports" + apt: name="{{ item }}" state=installed with_items: - dovecot-imapd - dovecot-ldap diff --git a/testsite/group_vars/all.yml b/testsite/group_vars/all.yml index 6fc1273374685f1a5bff8d06420b080362a87d29..452fbfdd3f024a72333fd880e8276c038fa714d9 100644 --- a/testsite/group_vars/all.yml +++ b/testsite/group_vars/all.yml @@ -23,7 +23,7 @@ os_groups: gid: 2001 common_packages: - - emacs23-nox + - emacs24-nox - screen - debconf-utils