Merge branch 'pkginstall' of github.com:Titan-C/sovereign

roles/common/tasks/encfs.yml

@@ -1,5 +1,5 @@
 - name: Install encfs & fuse
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - encfs
     - fuse

roles/common/tasks/main.yml

@@ -10,7 +10,7 @@
     - dependencies
 
 - name: Install necessities and nice-to-haves
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - apache2
     - apt-transport-https

roles/common/tasks/ntp.yml

@@ -2,7 +2,7 @@
 # Defines tasks applicable for NTP (Network Time Protocol)
 
 - name: Install ntp
-  apt: pkg=ntp state=installed
+  apt: pkg=ntp state=present
   tags:
     - dependencies
 

roles/common/tasks/postgres.yml

@@ -2,7 +2,7 @@
 # Defines tasks applicable for postgreSQL
 
 - name: Install Postgres
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - postgresql
     - python-psycopg2

roles/common/tasks/security.yml

@@ -1,5 +1,5 @@
 - name: Install security-related packages
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - fail2ban
     - whois
@@ -25,4 +25,3 @@
 
 - name: Update ssh config for more secure defaults
   template: src=etc_ssh_ssh_config.j2 dest=/etc/ssh/ssh_config
-

roles/git/tasks/cgit.yml

@@ -1,6 +1,6 @@
 
 - name: Install cgit dependencies
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - groff
     - libssl-dev

roles/git/tasks/gitolite.yml

@@ -8,7 +8,7 @@
   user: name=www-data groups=git append=yes
 
 - name: Install gitolite3 package
-  apt: pkg=gitolite3 state=installed
+  apt: pkg=gitolite3 state=present
   tags:
     - dependencies
 

roles/ircbouncer/tasks/znc.yml

@@ -1,7 +1,7 @@
 # more or less as per http://wiki.znc.in/Running_ZNC_as_a_system_daemon
 
 - name: Install znc
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - znc
   tags:

roles/mailserver/tasks/dovecot.yml

@@ -1,5 +1,5 @@
 - name: Install Dovecot and related packages
-  apt: pkg={{ item }} update_cache=yes state=installed
+  apt: pkg={{ item }} update_cache=yes state=present
   with_items:
     - dovecot-core
     - dovecot-imapd

roles/mailserver/tasks/postfix.yml

@@ -1,5 +1,5 @@
 - name: Install Postfix and related packages
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - libsasl2-modules
     - postfix

roles/mailserver/tasks/rspamd.yml

@@ -26,7 +26,7 @@
     - dependencies
 
 - name: Install Rspamd and Redis
-  apt: pkg={{ item }} state=installed update_cache=yes
+  apt: pkg={{ item }} state=present update_cache=yes
   with_items:
     - rspamd
     - redis-server

roles/mailserver/tasks/solr.yml

@@ -1,5 +1,5 @@
 - name: Install Solr and related packages
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - dovecot-solr
     - solr-tomcat

roles/mailserver/tasks/z-push.yml

@@ -1,5 +1,5 @@
 - name: Install required packages for z-push (PHP5 variant)
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - php-soap
     - php5
@@ -10,7 +10,7 @@
     - dependencies
 
 - name: Install required packages for z-push
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - php-soap
     - php

roles/monitoring/tasks/collectd.yml

@@ -1,5 +1,5 @@
 - name: Install collectd
-  apt: pkg=collectd state=installed
+  apt: pkg=collectd state=present
   tags:
       - dependencies
 

roles/monitoring/tasks/logwatch.yml

@@ -1,5 +1,5 @@
 - name: Install logwatch
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - libdate-manip-perl
     - logwatch

roles/monitoring/tasks/monit.yml

@@ -6,7 +6,7 @@
   notify: restart apache
 
 - name: Install monit
-  apt: pkg=monit state=installed
+  apt: pkg=monit state=present
   tags:
     - dependencies
 
@@ -33,4 +33,3 @@
     - sshd
     - tomcat
   notify: restart monit
-

roles/tarsnap/tasks/tarsnap.yml

@@ -8,7 +8,7 @@
 
 - name: Install dependencies for Tarsnap
   when: tarsnap_installed|failed
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - e2fslibs-dev
     - libssl-dev

roles/vpn/tasks/openvpn.yml

@@ -3,7 +3,7 @@
 # ref: https://library.linode.com/networking/openvpn/debian-6-squeeze
 
 - name: Install OpenVPN and dependencies
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=present
   with_items:
     - dnsmasq
     - openvpn