diff --git a/prosody/defaults/main.yml b/prosody/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..42019735e7a47cb5065c073106320b314f0c2f20
--- /dev/null
+++ b/prosody/defaults/main.yml
@@ -0,0 +1,34 @@
+---
+
+prosody_modules:
+  - name:        "posix" 
+    description: "POSIX functionality, sends server to background, enables syslog, etc."
+  - name:        "blocking"
+    description: "For XEP-0191 Simple Communications Blocking."
+  - name:        "csi"
+    description: "For XEP-0352 Client State Indication"
+  - name:        "throttle_presence" 
+    description: "Supress presence updates if CSI is enabled"
+  - name:        "filter_chatstates"
+    description: "Supress chatstate updates (someone is typing...) if CSI is enabled"
+  - name:        "smacks"
+    description: "For XEP-0198 Stream Management"
+  - name:        "mam"
+    description: "For XEP-0313 Message Archive Management"
+  - name:        "mam_muc"
+    description: "For XEP-0313 Message Archive Management for MUC"
+  - name:        "carbons"
+    description: "For XEP0280 Message Carbons"
+  - name:        "private"
+    description: "Private XML storage (for room bookmarks, etc.)"
+  - name:        "vcard"
+    description: "Allow users to set vCards"
+
+prosody_config_files:
+  - prosody
+  - virtual_host
+
+prosody_user: prosody
+prosody_db: prosody
+
+
diff --git a/prosody/files/prosody.cfg.lua b/prosody/files/prosody.cfg.lua
new file mode 100644
index 0000000000000000000000000000000000000000..b480f709045a22ec0cff79401836d6e64a327f65
--- /dev/null
+++ b/prosody/files/prosody.cfg.lua
@@ -0,0 +1,22 @@
+-- Prosody Example Configuration File
+--
+-- Information on configuring Prosody can be found on our
+-- website at http://prosody.im/doc/configure
+--
+-- Tip: You can check that the syntax of this file is correct
+-- when you have finished by running: luac -p prosody.cfg.lua
+-- If there are any errors, it will let you know what and where
+-- they are, otherwise it will keep quiet.
+--
+-- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+-- blanks. Good luck, and happy Jabbering!
+
+
+
+
+------ Additional config files ------
+-- For organizational purposes you may prefer to add VirtualHost and
+-- Component definitions in their own config files. This line includes
+-- all config files in /etc/prosody/conf.d/
+
+Include "conf.d/*.cfg.lua"
diff --git a/prosody/handlers/main.yml b/prosody/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..29f1967b2aa47c480327e829f5858b2c0e4e0f0c
--- /dev/null
+++ b/prosody/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+
+- name: restart prosody
+  service: state=restarted name=prosody
diff --git a/prosody/tasks/main.yml b/prosody/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5d2c50b1401947379bc6bb416e5038108b805790
--- /dev/null
+++ b/prosody/tasks/main.yml
@@ -0,0 +1,37 @@
+---
+- import_tasks: postgres.yml db_user="{{prosody_user}}" db_name="{{prosody_db}}"
+
+- name: ensure prosody is installed
+  apt: name={{ item }}  state=present
+  with_items:
+    - prosody
+    - prosody-modules
+  tags:
+    - prosody
+
+- name: ensure minimal config that includes only conf.d is present
+  copy: src=files/prosody.cfg.lua dest=/etc/prosody/cfg.lua mode=0640 owner=root group=prosody
+  tags:
+    - prosody
+  notify: restart prosody
+
+- name: ensure templated config is present
+  template: src=templates/{{ item }}.cfg.lua.j2 dest=/etc/prosody/conf.avail/{{ item }}.cfg.lua mode=0640 owner=root group=prosody
+  with_items: "{{ prosody_config_files }}"
+  tags:
+    - prosody
+
+- name: ensure templated config is active
+  file: src=/etc/prosody/conf.avail/{{ item }}.cfg.lua path=/etc/prosody/conf.d/{{ item }}.cfg.lua state=link mode=0640 owner=root group=prosody
+  with_items: "{{ prosody_config_files }}"
+  tags:
+    - prosody
+  notify: restart prosody
+
+- name: ensure prosody is running and enables
+  service: name=prosody state=started enabled=yes
+  tags:
+    - prosody
+
+
+- meta: flush_handlers
diff --git a/prosody/tasks/postgres.yml b/prosody/tasks/postgres.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2a852c44afc3b2f89652e8c61d79d1fecd1ecad9
--- /dev/null
+++ b/prosody/tasks/postgres.yml
@@ -0,0 +1,32 @@
+---
+
+- name: ensure we have a postgres database user
+  postgresql_user:
+    name: "{{ db_user }}"
+    state: present
+  become: yes
+  become_user: postgres
+  tags:
+    - postgres
+    
+- name: ensure we have a postgres database
+  postgresql_db:
+    name: "{{ db_name }}"
+    owner: "{{ db_user }}"
+    state: present
+  become: yes
+  become_user: postgres
+  tags:
+    - postgres
+
+- name: ensure the database user has privileges
+  postgresql_privs:
+    database: "{{ db_name }}"
+    roles: "{{ db_user }}"
+    privs: ALL
+    state: present
+    type: database
+  become: yes
+  become_user: postgres
+  tags:
+    - postgres
diff --git a/prosody/templates/prosody.cfg.lua.j2 b/prosody/templates/prosody.cfg.lua.j2
new file mode 100644
index 0000000000000000000000000000000000000000..7c276db564b69a1e9dd425195e8526c7d2481d68
--- /dev/null
+++ b/prosody/templates/prosody.cfg.lua.j2
@@ -0,0 +1,182 @@
+---------- Server-wide settings ----------
+-- Settings in this section apply to the whole server and are the default settings
+-- for any virtual hosts
+
+-- This is a (by default, empty) list of accounts that are admins
+-- for the server. Note that you must create the accounts separately
+-- (see http://prosody.im/doc/creating_accounts for info)
+-- Example: admins = { "user1@example.com", "user2@example.net" }
+admins = { {{ prosody_admin_accounts | join(",") }} }
+
+-- Enable use of libevent for better performance under high load
+-- For more information see: http://prosody.im/doc/libevent
+--use_libevent = true;
+
+-- This is the list of modules Prosody will load on startup.
+-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
+-- Documentation on modules can be found at: http://prosody.im/doc/modules
+modules_enabled = {
+
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
+
+	-- Not essential, but recommended
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"vcard"; -- Allow users to set vCards
+	
+	-- These are commented by default as they have a performance impact
+		--"privacy"; -- Support privacy lists
+		--"compression"; -- Stream compression (Debian: requires lua-zlib module to work)
+
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"register"; -- Allow users to register on this server using a client and change passwords
+
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	
+	-- HTTP modules
+		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"http_files"; -- Serve static files from a directory over HTTP
+
+	-- Other specific functionality
+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+		--"groups"; -- Shared roster support
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+{%- if prosody_modules is defined -%}              
+        {% for module in prosody_modules %} 
+                "{{ module.name }}"; -- {{ module.description }}
+        {% endfor %}
+{%- endif -%}
+};
+
+reload_modules={"tls"};
+
+-- These modules are auto-loaded, but should you want
+-- to disable them then uncomment them here:
+modules_disabled = {
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
+};
+
+-- Disable account creation by default, for security
+-- For more information see http://prosody.im/doc/creating_accounts
+allow_registration = false;
+
+-- Debian:
+--   send the server to background.
+--
+daemonize = true;
+
+-- Debian:
+--   Please, don't change this option since /var/run/prosody/
+--   is one of the few directories Prosody is allowed to write to
+--
+pidfile = "/var/run/prosody/prosody.pid";
+
+-- These are the SSL/TLS-related settings. If you don't want
+-- to use SSL/TLS, you may comment or remove this
+ssl = {
+	key = "/etc/prosody/certs/{{domain}}/privkey";
+	certificate = "/etc/prosody/certs/{{domain}}/fullchain";
+}
+
+-- Force clients to use encrypted connections? This option will
+-- prevent clients from authenticating unless they are using encryption.
+
+c2s_require_encryption = yes
+
+-- Force certificate authentication for server-to-server connections?
+-- This provides ideal security, but requires servers you communicate
+-- with to support encryption AND present valid, trusted certificates.
+-- NOTE: Your version of LuaSec must support certificate verification!
+-- For more information see http://prosody.im/doc/s2s#security
+
+s2s_secure_auth = yes
+
+-- Many servers don't support encryption or have invalid or self-signed
+-- certificates. You can list domains here that will not be required to
+-- authenticate using certificates. They will be authenticated using DNS.
+
+--s2s_insecure_domains = { "gmail.com" }
+
+-- Even if you leave s2s_secure_auth disabled, you can still require valid
+-- certificates for some domains by specifying a list here.
+
+--s2s_secure_domains = { "jabber.org" }
+
+-- Select the authentication backend to use. The 'internal' providers
+-- use Prosody's configured data storage to store the authentication data.
+-- To allow Prosody to offer secure authentication mechanisms to clients, the
+-- default provider stores passwords in plaintext. If you do not trust your
+-- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
+-- for information about using the hashed backend.
+
+authentication = "internal_hashed"
+
+-- Select the storage backend to use. By default Prosody uses flat files
+-- in its configured data directory, but it also supports more backends
+-- through modules. An "sql" backend is included by default, but requires
+-- additional dependencies. See http://prosody.im/doc/storage for more info.
+
+storage = "sql" -- Default is "internal" (Debian: "sql" requires one of the
+-- lua-dbi-sqlite3, lua-dbi-mysql or lua-dbi-postgresql packages to work)
+
+-- For the "sql" backend, you can uncomment *one* of the below to configure:
+--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
+--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
+sql = { driver = "PostgreSQL", database = "{{ prosody_db }}", username = "{{ prosody_user }}" }
+
+-- Logging configuration
+-- For advanced logging see http://prosody.im/doc/logging
+--
+-- Debian:
+--  Logs info and higher to /var/log
+--  Logs errors to syslog also
+log = {
+	-- Log files (change 'info' to 'debug' for debug logs):
+	info = "/var/log/prosody/prosody.log";
+	error = "/var/log/prosody/prosody.err";
+	-- Syslog:
+	{ levels = { "error" }; to = "syslog";  };
+}
+
+
+------ Components ------
+-- You can specify components to add hosts that provide special services,
+-- like multi-user conferences, and transports.
+-- For more information on components, see http://prosody.im/doc/components
+
+---Set up a MUC (multi-user chat) room server on conference.example.com:
+--Component "conference.example.com" "muc"
+
+{% if prosody_components is defined %}                
+{% for component in prosody_components %}
+    Component "{{ component.url }}" "{{ component.type }}"
+{% endfor %}
+{% endif %}
+-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers:
+--Component "proxy.example.com" "proxy65"
+
+---Set up an external component (default component port is 5347)
+--
+-- External components allow adding various services, such as gateways/
+-- transports to other networks like ICQ, MSN and Yahoo. For more info
+-- see: http://prosody.im/doc/components#adding_an_external_component
+--
+--Component "gateway.example.com"
+--	component_secret = "password"
diff --git a/prosody/templates/virtual_host.cfg.lua.j2 b/prosody/templates/virtual_host.cfg.lua.j2
new file mode 100644
index 0000000000000000000000000000000000000000..4ea4b4a970f45d91055f6d27055fd0388c30647f
--- /dev/null
+++ b/prosody/templates/virtual_host.cfg.lua.j2
@@ -0,0 +1,20 @@
+----------- Virtual hosts -----------
+-- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+-- Settings under each VirtualHost entry apply *only* to that host.
+
+{% for host in prosody_vhosts %}
+
+VirtualHost "{{ host.name }}"
+	enabled = {{ host.enabled }} -- Remove this line to enable this host
+
+	-- Assign this host a certificate for TLS, otherwise it would use the one
+	-- set in the global section (if any).
+	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
+	-- use the global one.
+	ssl = {
+		key = "/etc/prosody/certs/{{ host.name }}/privkey";
+		certificate = "/etc/prosody/certs/{{ host.name }}/fullchain";
+	}
+{% endfor %}
+
+