From a79772deb126e262db82a2ee6f172f39d2b71e95 Mon Sep 17 00:00:00 2001
From: Quentin Stafford-Fraser <quentin@pobox.com>
Date: Sun, 3 May 2015 20:58:21 +0100
Subject: [PATCH 1/7] Add webfaction modules

---
 cloud/webfaction/__init__.py           |   0
 cloud/webfaction/webfaction_app.py     | 153 ++++++++++++++++++++
 cloud/webfaction/webfaction_db.py      | 147 +++++++++++++++++++
 cloud/webfaction/webfaction_domain.py  | 134 ++++++++++++++++++
 cloud/webfaction/webfaction_mailbox.py | 112 +++++++++++++++
 cloud/webfaction/webfaction_site.py    | 189 +++++++++++++++++++++++++
 6 files changed, 735 insertions(+)
 create mode 100644 cloud/webfaction/__init__.py
 create mode 100644 cloud/webfaction/webfaction_app.py
 create mode 100644 cloud/webfaction/webfaction_db.py
 create mode 100644 cloud/webfaction/webfaction_domain.py
 create mode 100644 cloud/webfaction/webfaction_mailbox.py
 create mode 100644 cloud/webfaction/webfaction_site.py

diff --git a/cloud/webfaction/__init__.py b/cloud/webfaction/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/cloud/webfaction/webfaction_app.py b/cloud/webfaction/webfaction_app.py
new file mode 100644
index 00000000000..b1ddcd5a9c0
--- /dev/null
+++ b/cloud/webfaction/webfaction_app.py
@@ -0,0 +1,153 @@
+#! /usr/bin/python
+# Create a Webfaction application using Ansible and the Webfaction API
+#
+# Valid application types can be found by looking here:
+# http://docs.webfaction.com/xmlrpc-api/apps.html#application-types
+#
+# Quentin Stafford-Fraser 2015
+
+DOCUMENTATION = '''
+---
+module: webfaction_app
+short_description: Add or remove applications on a Webfaction host
+description:
+    - Add or remove applications on a Webfaction host.  Further documentation at http://github.com/quentinsf/ansible-webfaction.
+author: Quentin Stafford-Fraser
+version_added: 1.99
+notes:
+    - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
+    - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+
+options:
+    name:
+        description:
+            - The name of the application
+        required: true
+        default: null
+
+    state:
+        description:
+            - Whether the application should exist
+        required: false
+        choices: ['present', 'absent']
+        default: "present"
+
+    type:
+        description:
+            - The type of application to create. See the Webfaction docs at http://docs.webfaction.com/xmlrpc-api/apps.html for a list.
+        required: true
+
+    autostart:
+        description:
+            - Whether the app should restart with an autostart.cgi script
+        required: false
+        default: "no"
+
+    extra_info:
+        description:
+            - Any extra parameters required by the app
+        required: false
+        default: null
+
+    open_port:
+        required: false
+        default: false
+
+    login_name:
+        description:
+            - The webfaction account to use
+        required: true
+
+    login_password:
+        description:
+            - The webfaction password to use
+        required: true
+'''
+
+import xmlrpclib
+from ansible.module_utils.basic import *
+
+webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
+
+def main():
+
+    module = AnsibleModule(
+        argument_spec = dict(
+            name = dict(required=True, default=None),
+            state = dict(required=False, default='present'),
+            type = dict(required=True),
+            autostart = dict(required=False, choices=BOOLEANS, default='false'),
+            extra_info = dict(required=False, default=""),
+            port_open = dict(required=False, default="false"),
+            login_name = dict(required=True),
+            login_password = dict(required=True),
+        ),
+        supports_check_mode=True
+    )
+    app_name  = module.params['name']
+    app_type = module.params['type']
+    app_state = module.params['state']
+
+    session_id, account = webfaction.login(
+        module.params['login_name'],
+        module.params['login_password']
+    )
+
+    app_list = webfaction.list_apps(session_id)
+    app_map = dict([(i['name'], i) for i in app_list])
+    existing_app = app_map.get(app_name)
+
+    result = {}
+    
+    # Here's where the real stuff happens
+
+    if app_state == 'present':
+
+        # Does an app with this name already exist?
+        if existing_app:
+            if existing_app['type'] != app_type:
+                module.fail_json(msg="App already exists with different type. Please fix by hand.")
+
+            # If it exists with the right type, we don't change it
+            # Should check other parameters.
+            module.exit_json(
+                changed = False,
+            )
+
+        if not module.check_mode:
+            # If this isn't a dry run, create the app
+            result.update(
+                webfaction.create_app(
+                    session_id, app_name, app_type, 
+                    module.boolean(module.params['autostart']), 
+                    module.params['extra_info'],
+                    module.boolean(module.params['port_open'])
+                )
+            )
+
+    elif app_state == 'absent':
+
+        # If the app's already not there, nothing changed.
+        if not existing_app:
+            module.exit_json(
+                changed = False,
+            )
+
+        if not module.check_mode:
+            # If this isn't a dry run, delete the app
+            result.update(
+                webfaction.delete_app(session_id, app_name)
+            )
+
+    else:
+        module.fail_json(msg="Unknown state specified: {}".format(app_state))
+
+
+    module.exit_json(
+        changed = True,
+        result = result
+    )
+
+# The conventional ending
+main()
+
diff --git a/cloud/webfaction/webfaction_db.py b/cloud/webfaction/webfaction_db.py
new file mode 100644
index 00000000000..7205a084ef2
--- /dev/null
+++ b/cloud/webfaction/webfaction_db.py
@@ -0,0 +1,147 @@
+#! /usr/bin/python
+# Create webfaction database using Ansible and the Webfaction API
+#
+# Quentin Stafford-Fraser 2015
+
+DOCUMENTATION = '''
+---
+module: webfaction_db
+short_description: Add or remove a database on Webfaction
+description:
+    - Add or remove a database on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
+author: Quentin Stafford-Fraser
+version_added: 1.99
+notes:
+    - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
+    - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+options:
+
+    name:
+        description:
+            - The name of the database
+        required: true
+        default: null
+
+    state:
+        description:
+            - Whether the database should exist
+        required: false
+        choices: ['present', 'absent']
+        default: "present"
+
+    type:
+        description:
+            - The type of database to create.
+        required: true
+        choices: ['mysql', 'postgresql']
+
+    login_name:
+        description:
+            - The webfaction account to use
+        required: true
+
+    login_password:
+        description:
+            - The webfaction password to use
+        required: true
+'''
+
+EXAMPLES = '''
+  # This will also create a default DB user with the same
+  # name as the database, and the specified password.
+  
+  - name: Create a database
+    webfaction_db:
+      name: "{{webfaction_user}}_db1"
+      password: mytestsql
+      type: mysql
+      login_name: "{{webfaction_user}}"
+      login_password: "{{webfaction_passwd}}"
+'''
+
+import socket
+import xmlrpclib
+from ansible.module_utils.basic import *
+
+webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
+
+def main():
+
+    module = AnsibleModule(
+        argument_spec = dict(
+            name = dict(required=True, default=None),
+            state = dict(required=False, default='present'),
+            # You can specify an IP address or hostname.
+            type = dict(required=True, default=None),
+            password = dict(required=False, default=None),
+            login_name = dict(required=True),
+            login_password = dict(required=True),
+        ),
+        supports_check_mode=True
+    )
+    db_name  = module.params['name']
+    db_state = module.params['state']
+    db_type  = module.params['type']
+    db_passwd = module.params['password']
+
+    session_id, account = webfaction.login(
+        module.params['login_name'],
+        module.params['login_password']
+    )
+
+    db_list = webfaction.list_dbs(session_id)
+    db_map = dict([(i['name'], i) for i in db_list])
+    existing_db = db_map.get(db_name)
+
+    result = {}
+    
+    # Here's where the real stuff happens
+
+    if db_state == 'present':
+
+        # Does an app with this name already exist?
+        if existing_db:
+            # Yes, but of a different type - fail
+            if existing_db['db_type'] != db_type:
+                module.fail_json(msg="Database already exists but is a different type. Please fix by hand.")
+
+            # If it exists with the right type, we don't change anything.
+            module.exit_json(
+                changed = False,
+            )
+
+
+        if not module.check_mode:
+            # If this isn't a dry run, create the app
+            # print positional_args
+            result.update(
+                webfaction.create_db(
+                    session_id, db_name, db_type, db_passwd
+                )
+            )
+
+    elif db_state == 'absent':
+
+        # If the app's already not there, nothing changed.
+        if not existing_db:
+            module.exit_json(
+                changed = False,
+            )
+
+        if not module.check_mode:
+            # If this isn't a dry run, delete the app
+            result.update(
+                webfaction.delete_db(session_id, db_name, db_type)
+            )
+
+    else:
+        module.fail_json(msg="Unknown state specified: {}".format(db_state))
+
+    module.exit_json(
+        changed = True,
+        result = result
+    )
+
+# The conventional ending
+main()
+
diff --git a/cloud/webfaction/webfaction_domain.py b/cloud/webfaction/webfaction_domain.py
new file mode 100644
index 00000000000..2f3c8542754
--- /dev/null
+++ b/cloud/webfaction/webfaction_domain.py
@@ -0,0 +1,134 @@
+#! /usr/bin/python
+# Create Webfaction domains and subdomains using Ansible and the Webfaction API
+#
+# Quentin Stafford-Fraser 2015
+
+DOCUMENTATION = '''
+---
+module: webfaction_domain
+short_description: Add or remove domains and subdomains on Webfaction
+description:
+    - Add or remove domains or subdomains on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
+author: Quentin Stafford-Fraser
+version_added: 1.99
+notes:
+    - If you are I(deleting) domains by using C(state=absent), then note that if you specify subdomains, just those particular subdomains will be deleted.  If you don't specify subdomains, the domain will be deleted.
+    - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
+    - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+
+options:
+
+    name:
+        description:
+            - The name of the domain
+        required: true
+        default: null
+
+    state:
+        description:
+            - Whether the domain should exist
+        required: false
+        choices: ['present', 'absent']
+        default: "present"
+
+    subdomains:
+        description:
+            - Any subdomains to create.
+        required: false
+        default: null
+
+    login_name:
+        description:
+            - The webfaction account to use
+        required: true
+
+    login_password:
+        description:
+            - The webfaction password to use
+        required: true
+'''
+
+import socket
+import xmlrpclib
+from ansible.module_utils.basic import *
+
+webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
+
+def main():
+
+    module = AnsibleModule(
+        argument_spec = dict(
+            name = dict(required=True, default=None),
+            state = dict(required=False, default='present'),
+            subdomains = dict(required=False, default=[]),
+            login_name = dict(required=True),
+            login_password = dict(required=True),
+        ),
+        supports_check_mode=True
+    )
+    domain_name  = module.params['name']
+    domain_state = module.params['state']
+    domain_subdomains = module.params['subdomains']
+
+    session_id, account = webfaction.login(
+        module.params['login_name'],
+        module.params['login_password']
+    )
+
+    domain_list = webfaction.list_domains(session_id)
+    domain_map = dict([(i['domain'], i) for i in domain_list])
+    existing_domain = domain_map.get(domain_name)
+
+    result = {}
+    
+    # Here's where the real stuff happens
+
+    if domain_state == 'present':
+
+        # Does an app with this name already exist?
+        if existing_domain:
+
+            if set(existing_domain['subdomains']) >= set(domain_subdomains):
+                # If it exists with the right subdomains, we don't change anything.
+                module.exit_json(
+                    changed = False,
+                )
+
+        positional_args = [session_id, domain_name] + domain_subdomains
+
+        if not module.check_mode:
+            # If this isn't a dry run, create the app
+            # print positional_args
+            result.update(
+                webfaction.create_domain(
+                    *positional_args
+                )
+            )
+
+    elif domain_state == 'absent':
+
+        # If the app's already not there, nothing changed.
+        if not existing_domain:
+            module.exit_json(
+                changed = False,
+            )
+
+        positional_args = [session_id, domain_name] + domain_subdomains
+
+        if not module.check_mode:
+            # If this isn't a dry run, delete the app
+            result.update(
+                webfaction.delete_domain(*positional_args)
+            )
+
+    else:
+        module.fail_json(msg="Unknown state specified: {}".format(domain_state))
+
+    module.exit_json(
+        changed = True,
+        result = result
+    )
+
+# The conventional ending
+main()
+
diff --git a/cloud/webfaction/webfaction_mailbox.py b/cloud/webfaction/webfaction_mailbox.py
new file mode 100644
index 00000000000..3ac848d6a94
--- /dev/null
+++ b/cloud/webfaction/webfaction_mailbox.py
@@ -0,0 +1,112 @@
+#! /usr/bin/python
+# Create webfaction mailbox using Ansible and the Webfaction API
+#
+# Quentin Stafford-Fraser and Andy Baker 2015
+
+DOCUMENTATION = '''
+---
+module: webfaction_mailbox
+short_description: Add or remove mailboxes on Webfaction
+description:
+    - Add or remove mailboxes on a Webfaction account. Further documentation at http://github.com/quentinsf/ansible-webfaction.
+author: Quentin Stafford-Fraser
+version_added: 1.99
+notes:
+    - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
+    - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+options:
+
+    mailbox_name:
+        description:
+            - The name of the mailbox
+        required: true
+        default: null
+
+    mailbox_password:
+        description:
+            - The password for the mailbox
+        required: true
+        default: null
+
+    state:
+        description:
+            - Whether the mailbox should exist
+        required: false
+        choices: ['present', 'absent']
+        default: "present"
+
+    login_name:
+        description:
+            - The webfaction account to use
+        required: true
+
+    login_password:
+        description:
+            - The webfaction password to use
+        required: true
+'''
+
+import socket
+import xmlrpclib
+from ansible.module_utils.basic import *
+
+webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
+
+def main():
+
+    module = AnsibleModule(
+        argument_spec=dict(
+            mailbox_name=dict(required=True, default=None),
+            mailbox_password=dict(required=True),
+            state=dict(required=False, default='present'),
+            login_name=dict(required=True),
+            login_password=dict(required=True),
+        ),
+        supports_check_mode=True
+    )
+
+    mailbox_name = module.params['mailbox_name']
+    site_state = module.params['state']
+
+    session_id, account = webfaction.login(
+        module.params['login_name'],
+        module.params['login_password']
+    )
+
+    mailbox_list = webfaction.list_mailboxes(session_id)
+    existing_mailbox = mailbox_name in mailbox_list
+
+    result = {}
+    
+    # Here's where the real stuff happens
+
+    if site_state == 'present':
+
+        # Does a mailbox with this name already exist?
+        if existing_mailbox:
+            module.exit_json(changed=False,)
+
+        positional_args = [session_id, mailbox_name]
+
+        if not module.check_mode:
+            # If this isn't a dry run, create the mailbox
+            result.update(webfaction.create_mailbox(*positional_args))
+
+    elif site_state == 'absent':
+
+        # If the mailbox is already not there, nothing changed.
+        if not existing_mailbox:
+            module.exit_json(changed=False)
+
+        if not module.check_mode:
+            # If this isn't a dry run, delete the mailbox
+            result.update(webfaction.delete_mailbox(session_id, mailbox_name))
+
+    else:
+        module.fail_json(msg="Unknown state specified: {}".format(site_state))
+
+    module.exit_json(changed=True, result=result)
+
+# The conventional ending
+main()
+
diff --git a/cloud/webfaction/webfaction_site.py b/cloud/webfaction/webfaction_site.py
new file mode 100644
index 00000000000..5db89355966
--- /dev/null
+++ b/cloud/webfaction/webfaction_site.py
@@ -0,0 +1,189 @@
+#! /usr/bin/python
+# Create Webfaction website using Ansible and the Webfaction API
+#
+# Quentin Stafford-Fraser 2015
+
+DOCUMENTATION = '''
+---
+module: webfaction_site
+short_description: Add or remove a website on a Webfaction host
+description:
+    - Add or remove a website on a Webfaction host.  Further documentation at http://github.com/quentinsf/ansible-webfaction.
+author: Quentin Stafford-Fraser
+version_added: 1.99
+notes:
+    - Sadly, you I(do) need to know your webfaction hostname for the C(host) parameter.  But at least, unlike the API, you don't need to know the IP address - you can use a DNS name.
+    - If a site of the same name exists in the account but on a different host, the operation will exit.
+    - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
+    - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+
+options:
+
+    name:
+        description:
+            - The name of the website
+        required: true
+        default: null
+
+    state:
+        description:
+            - Whether the website should exist
+        required: false
+        choices: ['present', 'absent']
+        default: "present"
+            
+    host:
+        description:
+            - The webfaction host on which the site should be created.
+        required: true
+
+    https:
+        description:
+            - Whether or not to use HTTPS
+        required: false
+        choices: BOOLEANS 
+        default: 'false'
+
+    site_apps:
+        description:
+            - A mapping of URLs to apps
+        required: false
+
+    subdomains:
+        description:
+            - A list of subdomains associated with this site.
+        required: false
+        default: null
+
+    login_name:
+        description:
+            - The webfaction account to use
+        required: true
+
+    login_password:
+        description:
+            - The webfaction password to use
+        required: true
+'''
+
+EXAMPLES = '''
+  - name: create website
+    webfaction_site:
+      name: testsite1
+      state: present
+      host: myhost.webfaction.com 
+      subdomains: 
+        - 'testsite1.my_domain.org'
+      site_apps:
+        - ['testapp1', '/']
+      https: no
+      login_name: "{{webfaction_user}}"
+      login_password: "{{webfaction_passwd}}"
+'''
+
+import socket
+import xmlrpclib
+from ansible.module_utils.basic import *
+
+webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
+
+def main():
+
+    module = AnsibleModule(
+        argument_spec = dict(
+            name = dict(required=True, default=None),
+            state = dict(required=False, default='present'),
+            # You can specify an IP address or hostname.
+            host = dict(required=True, default=None),
+            https = dict(required=False, choices=BOOLEANS, default='false'),
+            subdomains = dict(required=False, default=[]),
+            site_apps = dict(required=False, default=[]),
+            login_name = dict(required=True),
+            login_password = dict(required=True),
+        ),
+        supports_check_mode=True
+    )
+    site_name  = module.params['name']
+    site_state = module.params['state']
+    site_host = module.params['host']
+    site_ip = socket.gethostbyname(site_host)
+
+    session_id, account = webfaction.login(
+        module.params['login_name'],
+        module.params['login_password']
+    )
+
+    site_list = webfaction.list_websites(session_id)
+    site_map = dict([(i['name'], i) for i in site_list])
+    existing_site = site_map.get(site_name)
+
+    result = {}
+    
+    # Here's where the real stuff happens
+
+    if site_state == 'present':
+
+        # Does a site with this name already exist?
+        if existing_site:
+
+            # If yes, but it's on a different IP address, then fail.
+            # If we wanted to allow relocation, we could add a 'relocate=true' option
+            # which would get the existing IP address, delete the site there, and create it
+            # at the new address.  A bit dangerous, perhaps, so for now we'll require manual
+            # deletion if it's on another host.
+
+            if existing_site['ip'] != site_ip:
+                module.fail_json(msg="Website already exists with a different IP address. Please fix by hand.")
+
+            # If it's on this host and the key parameters are the same, nothing needs to be done.
+
+            if (existing_site['https'] == module.boolean(module.params['https'])) and \
+               (set(existing_site['subdomains']) == set(module.params['subdomains'])) and \
+               (dict(existing_site['website_apps']) == dict(module.params['site_apps'])):
+                module.exit_json(
+                    changed = False
+                )
+
+        positional_args = [ 
+            session_id, site_name, site_ip, 
+            module.boolean(module.params['https']),
+            module.params['subdomains'],
+        ]
+        for a in module.params['site_apps']:
+            positional_args.append( (a[0], a[1]) )
+
+        if not module.check_mode:
+            # If this isn't a dry run, create or modify the site
+            result.update(
+                    webfaction.create_website(
+                        *positional_args
+                    ) if not existing_site else webfaction.update_website (
+                        *positional_args
+                    )
+            )
+
+    elif site_state == 'absent':
+
+        # If the site's already not there, nothing changed.
+        if not existing_site:
+            module.exit_json(
+                changed = False,
+            )
+
+        if not module.check_mode:
+            # If this isn't a dry run, delete the site
+            result.update(
+                webfaction.delete_website(session_id, site_name, site_ip)
+            )
+
+    else:
+        module.fail_json(msg="Unknown state specified: {}".format(site_state))
+
+    module.exit_json(
+        changed = True,
+        result = result
+    )
+
+# The conventional ending
+main()
+

From d1d65fe544c6a26263778643da07d3fd77bb482e Mon Sep 17 00:00:00 2001
From: Quentin Stafford-Fraser <quentin@pobox.com>
Date: Sun, 3 May 2015 23:48:51 +0100
Subject: [PATCH 2/7] Tidying of webfaction modules

---
 cloud/webfaction/webfaction_app.py     | 12 +++++-------
 cloud/webfaction/webfaction_db.py      | 10 ++++------
 cloud/webfaction/webfaction_domain.py  |  8 +++-----
 cloud/webfaction/webfaction_mailbox.py |  9 ++++-----
 cloud/webfaction/webfaction_site.py    | 14 +++++++-------
 5 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/cloud/webfaction/webfaction_app.py b/cloud/webfaction/webfaction_app.py
index b1ddcd5a9c0..08a0205eb87 100644
--- a/cloud/webfaction/webfaction_app.py
+++ b/cloud/webfaction/webfaction_app.py
@@ -13,7 +13,7 @@ short_description: Add or remove applications on a Webfaction host
 description:
     - Add or remove applications on a Webfaction host.  Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 1.99
+version_added: 2.0
 notes:
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
     - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
@@ -23,7 +23,6 @@ options:
         description:
             - The name of the application
         required: true
-        default: null
 
     state:
         description:
@@ -65,7 +64,6 @@ options:
 '''
 
 import xmlrpclib
-from ansible.module_utils.basic import *
 
 webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
 
@@ -73,12 +71,12 @@ def main():
 
     module = AnsibleModule(
         argument_spec = dict(
-            name = dict(required=True, default=None),
+            name = dict(required=True),
             state = dict(required=False, default='present'),
             type = dict(required=True),
-            autostart = dict(required=False, choices=BOOLEANS, default='false'),
+            autostart = dict(required=False, choices=BOOLEANS, default=False),
             extra_info = dict(required=False, default=""),
-            port_open = dict(required=False, default="false"),
+            port_open = dict(required=False, choices=BOOLEANS, default=False),
             login_name = dict(required=True),
             login_password = dict(required=True),
         ),
@@ -148,6 +146,6 @@ def main():
         result = result
     )
 
-# The conventional ending
+from ansible.module_utils.basic import *
 main()
 
diff --git a/cloud/webfaction/webfaction_db.py b/cloud/webfaction/webfaction_db.py
index 7205a084ef2..479540abc5c 100644
--- a/cloud/webfaction/webfaction_db.py
+++ b/cloud/webfaction/webfaction_db.py
@@ -10,7 +10,7 @@ short_description: Add or remove a database on Webfaction
 description:
     - Add or remove a database on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 1.99
+version_added: 2.0
 notes:
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
     - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
@@ -20,7 +20,6 @@ options:
         description:
             - The name of the database
         required: true
-        default: null
 
     state:
         description:
@@ -61,7 +60,6 @@ EXAMPLES = '''
 
 import socket
 import xmlrpclib
-from ansible.module_utils.basic import *
 
 webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
 
@@ -69,10 +67,10 @@ def main():
 
     module = AnsibleModule(
         argument_spec = dict(
-            name = dict(required=True, default=None),
+            name = dict(required=True),
             state = dict(required=False, default='present'),
             # You can specify an IP address or hostname.
-            type = dict(required=True, default=None),
+            type = dict(required=True),
             password = dict(required=False, default=None),
             login_name = dict(required=True),
             login_password = dict(required=True),
@@ -142,6 +140,6 @@ def main():
         result = result
     )
 
-# The conventional ending
+from ansible.module_utils.basic import *
 main()
 
diff --git a/cloud/webfaction/webfaction_domain.py b/cloud/webfaction/webfaction_domain.py
index 2f3c8542754..a9e2b7dd9bb 100644
--- a/cloud/webfaction/webfaction_domain.py
+++ b/cloud/webfaction/webfaction_domain.py
@@ -10,7 +10,7 @@ short_description: Add or remove domains and subdomains on Webfaction
 description:
     - Add or remove domains or subdomains on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 1.99
+version_added: 2.0
 notes:
     - If you are I(deleting) domains by using C(state=absent), then note that if you specify subdomains, just those particular subdomains will be deleted.  If you don't specify subdomains, the domain will be deleted.
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
@@ -22,7 +22,6 @@ options:
         description:
             - The name of the domain
         required: true
-        default: null
 
     state:
         description:
@@ -50,7 +49,6 @@ options:
 
 import socket
 import xmlrpclib
-from ansible.module_utils.basic import *
 
 webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
 
@@ -58,7 +56,7 @@ def main():
 
     module = AnsibleModule(
         argument_spec = dict(
-            name = dict(required=True, default=None),
+            name = dict(required=True),
             state = dict(required=False, default='present'),
             subdomains = dict(required=False, default=[]),
             login_name = dict(required=True),
@@ -129,6 +127,6 @@ def main():
         result = result
     )
 
-# The conventional ending
+from ansible.module_utils.basic import *
 main()
 
diff --git a/cloud/webfaction/webfaction_mailbox.py b/cloud/webfaction/webfaction_mailbox.py
index 3ac848d6a94..1ba571a1dd1 100644
--- a/cloud/webfaction/webfaction_mailbox.py
+++ b/cloud/webfaction/webfaction_mailbox.py
@@ -10,7 +10,7 @@ short_description: Add or remove mailboxes on Webfaction
 description:
     - Add or remove mailboxes on a Webfaction account. Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 1.99
+version_added: 2.0
 notes:
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
     - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
@@ -20,7 +20,6 @@ options:
         description:
             - The name of the mailbox
         required: true
-        default: null
 
     mailbox_password:
         description:
@@ -48,7 +47,6 @@ options:
 
 import socket
 import xmlrpclib
-from ansible.module_utils.basic import *
 
 webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
 
@@ -56,7 +54,7 @@ def main():
 
     module = AnsibleModule(
         argument_spec=dict(
-            mailbox_name=dict(required=True, default=None),
+            mailbox_name=dict(required=True),
             mailbox_password=dict(required=True),
             state=dict(required=False, default='present'),
             login_name=dict(required=True),
@@ -107,6 +105,7 @@ def main():
 
     module.exit_json(changed=True, result=result)
 
-# The conventional ending
+
+from ansible.module_utils.basic import *
 main()
 
diff --git a/cloud/webfaction/webfaction_site.py b/cloud/webfaction/webfaction_site.py
index 5db89355966..575e6eec996 100644
--- a/cloud/webfaction/webfaction_site.py
+++ b/cloud/webfaction/webfaction_site.py
@@ -10,7 +10,7 @@ short_description: Add or remove a website on a Webfaction host
 description:
     - Add or remove a website on a Webfaction host.  Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 1.99
+version_added: 2.0
 notes:
     - Sadly, you I(do) need to know your webfaction hostname for the C(host) parameter.  But at least, unlike the API, you don't need to know the IP address - you can use a DNS name.
     - If a site of the same name exists in the account but on a different host, the operation will exit.
@@ -23,7 +23,6 @@ options:
         description:
             - The name of the website
         required: true
-        default: null
 
     state:
         description:
@@ -83,7 +82,6 @@ EXAMPLES = '''
 
 import socket
 import xmlrpclib
-from ansible.module_utils.basic import *
 
 webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
 
@@ -91,11 +89,11 @@ def main():
 
     module = AnsibleModule(
         argument_spec = dict(
-            name = dict(required=True, default=None),
+            name = dict(required=True),
             state = dict(required=False, default='present'),
             # You can specify an IP address or hostname.
-            host = dict(required=True, default=None),
-            https = dict(required=False, choices=BOOLEANS, default='false'),
+            host = dict(required=True),
+            https = dict(required=False, choices=BOOLEANS, default=False),
             subdomains = dict(required=False, default=[]),
             site_apps = dict(required=False, default=[]),
             login_name = dict(required=True),
@@ -184,6 +182,8 @@ def main():
         result = result
     )
 
-# The conventional ending
+
+
+from ansible.module_utils.basic import *
 main()
 

From a0ef5e4a5973f850fdcc019896ede93fe8595675 Mon Sep 17 00:00:00 2001
From: Quentin Stafford-Fraser <quentin@pobox.com>
Date: Sun, 10 May 2015 20:40:50 +0100
Subject: [PATCH 3/7] Documentation version_added numbers are strings.

---
 cloud/webfaction/webfaction_app.py     | 2 +-
 cloud/webfaction/webfaction_db.py      | 2 +-
 cloud/webfaction/webfaction_domain.py  | 2 +-
 cloud/webfaction/webfaction_mailbox.py | 2 +-
 cloud/webfaction/webfaction_site.py    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cloud/webfaction/webfaction_app.py b/cloud/webfaction/webfaction_app.py
index 08a0205eb87..dec5f8e5d5e 100644
--- a/cloud/webfaction/webfaction_app.py
+++ b/cloud/webfaction/webfaction_app.py
@@ -13,7 +13,7 @@ short_description: Add or remove applications on a Webfaction host
 description:
     - Add or remove applications on a Webfaction host.  Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 2.0
+version_added: "2.0"
 notes:
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
     - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
diff --git a/cloud/webfaction/webfaction_db.py b/cloud/webfaction/webfaction_db.py
index 479540abc5c..fc522439591 100644
--- a/cloud/webfaction/webfaction_db.py
+++ b/cloud/webfaction/webfaction_db.py
@@ -10,7 +10,7 @@ short_description: Add or remove a database on Webfaction
 description:
     - Add or remove a database on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 2.0
+version_added: "2.0"
 notes:
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
     - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
diff --git a/cloud/webfaction/webfaction_domain.py b/cloud/webfaction/webfaction_domain.py
index a9e2b7dd9bb..31339014e6c 100644
--- a/cloud/webfaction/webfaction_domain.py
+++ b/cloud/webfaction/webfaction_domain.py
@@ -10,7 +10,7 @@ short_description: Add or remove domains and subdomains on Webfaction
 description:
     - Add or remove domains or subdomains on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 2.0
+version_added: "2.0"
 notes:
     - If you are I(deleting) domains by using C(state=absent), then note that if you specify subdomains, just those particular subdomains will be deleted.  If you don't specify subdomains, the domain will be deleted.
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
diff --git a/cloud/webfaction/webfaction_mailbox.py b/cloud/webfaction/webfaction_mailbox.py
index 1ba571a1dd1..5eb82df3eaa 100644
--- a/cloud/webfaction/webfaction_mailbox.py
+++ b/cloud/webfaction/webfaction_mailbox.py
@@ -10,7 +10,7 @@ short_description: Add or remove mailboxes on Webfaction
 description:
     - Add or remove mailboxes on a Webfaction account. Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 2.0
+version_added: "2.0"
 notes:
     - "You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API - the location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as your host, you may want to add C(serial: 1) to the plays."
     - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
diff --git a/cloud/webfaction/webfaction_site.py b/cloud/webfaction/webfaction_site.py
index 575e6eec996..c981a21fc2b 100644
--- a/cloud/webfaction/webfaction_site.py
+++ b/cloud/webfaction/webfaction_site.py
@@ -10,7 +10,7 @@ short_description: Add or remove a website on a Webfaction host
 description:
     - Add or remove a website on a Webfaction host.  Further documentation at http://github.com/quentinsf/ansible-webfaction.
 author: Quentin Stafford-Fraser
-version_added: 2.0
+version_added: "2.0"
 notes:
     - Sadly, you I(do) need to know your webfaction hostname for the C(host) parameter.  But at least, unlike the API, you don't need to know the IP address - you can use a DNS name.
     - If a site of the same name exists in the account but on a different host, the operation will exit.

From de28b84bf79a3b36e95aa4fabf6b080736bceee7 Mon Sep 17 00:00:00 2001
From: Quentin Stafford-Fraser <quentin@pobox.com>
Date: Sun, 10 May 2015 20:47:31 +0100
Subject: [PATCH 4/7] Available choices for 'state' explicitly listed.

---
 cloud/webfaction/webfaction_app.py     | 2 +-
 cloud/webfaction/webfaction_db.py      | 2 +-
 cloud/webfaction/webfaction_domain.py  | 2 +-
 cloud/webfaction/webfaction_mailbox.py | 2 +-
 cloud/webfaction/webfaction_site.py    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cloud/webfaction/webfaction_app.py b/cloud/webfaction/webfaction_app.py
index dec5f8e5d5e..05b31f55a4a 100644
--- a/cloud/webfaction/webfaction_app.py
+++ b/cloud/webfaction/webfaction_app.py
@@ -72,7 +72,7 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             name = dict(required=True),
-            state = dict(required=False, default='present'),
+            state = dict(required=False, choices=['present', 'absent'], default='present'),
             type = dict(required=True),
             autostart = dict(required=False, choices=BOOLEANS, default=False),
             extra_info = dict(required=False, default=""),
diff --git a/cloud/webfaction/webfaction_db.py b/cloud/webfaction/webfaction_db.py
index fc522439591..784477c5409 100644
--- a/cloud/webfaction/webfaction_db.py
+++ b/cloud/webfaction/webfaction_db.py
@@ -68,7 +68,7 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             name = dict(required=True),
-            state = dict(required=False, default='present'),
+            state = dict(required=False, choices=['present', 'absent'], default='present'),
             # You can specify an IP address or hostname.
             type = dict(required=True),
             password = dict(required=False, default=None),
diff --git a/cloud/webfaction/webfaction_domain.py b/cloud/webfaction/webfaction_domain.py
index 31339014e6c..8548c4fba37 100644
--- a/cloud/webfaction/webfaction_domain.py
+++ b/cloud/webfaction/webfaction_domain.py
@@ -57,7 +57,7 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             name = dict(required=True),
-            state = dict(required=False, default='present'),
+            state = dict(required=False, choices=['present', 'absent'], default='present'),
             subdomains = dict(required=False, default=[]),
             login_name = dict(required=True),
             login_password = dict(required=True),
diff --git a/cloud/webfaction/webfaction_mailbox.py b/cloud/webfaction/webfaction_mailbox.py
index 5eb82df3eaa..fee5700e50e 100644
--- a/cloud/webfaction/webfaction_mailbox.py
+++ b/cloud/webfaction/webfaction_mailbox.py
@@ -56,7 +56,7 @@ def main():
         argument_spec=dict(
             mailbox_name=dict(required=True),
             mailbox_password=dict(required=True),
-            state=dict(required=False, default='present'),
+            state=dict(required=False, choices=['present', 'absent'], default='present'),
             login_name=dict(required=True),
             login_password=dict(required=True),
         ),
diff --git a/cloud/webfaction/webfaction_site.py b/cloud/webfaction/webfaction_site.py
index c981a21fc2b..a5be4f5407b 100644
--- a/cloud/webfaction/webfaction_site.py
+++ b/cloud/webfaction/webfaction_site.py
@@ -90,7 +90,7 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             name = dict(required=True),
-            state = dict(required=False, default='present'),
+            state = dict(required=False, choices=['present', 'absent'], default='present'),
             # You can specify an IP address or hostname.
             host = dict(required=True),
             https = dict(required=False, choices=BOOLEANS, default=False),

From 3645b61f46ae2e4a436401735bb4a4227516e3b5 Mon Sep 17 00:00:00 2001
From: Quentin Stafford-Fraser <quentin@pobox.com>
Date: Sun, 10 May 2015 22:07:49 +0100
Subject: [PATCH 5/7] Add examples.

---
 cloud/webfaction/webfaction_app.py     | 10 ++++++++++
 cloud/webfaction/webfaction_domain.py  | 20 ++++++++++++++++++++
 cloud/webfaction/webfaction_mailbox.py | 10 ++++++++++
 3 files changed, 40 insertions(+)

diff --git a/cloud/webfaction/webfaction_app.py b/cloud/webfaction/webfaction_app.py
index 05b31f55a4a..20e94a7b5f6 100644
--- a/cloud/webfaction/webfaction_app.py
+++ b/cloud/webfaction/webfaction_app.py
@@ -63,6 +63,16 @@ options:
         required: true
 '''
 
+EXAMPLES = '''
+  - name: Create a test app
+    webfaction_app:
+      name="my_wsgi_app1"
+      state=present
+      type=mod_wsgi35-python27 
+      login_name={{webfaction_user}}
+      login_password={{webfaction_passwd}}
+'''
+
 import xmlrpclib
 
 webfaction = xmlrpclib.ServerProxy('https://api.webfaction.com/')
diff --git a/cloud/webfaction/webfaction_domain.py b/cloud/webfaction/webfaction_domain.py
index 8548c4fba37..c99a0f23f6d 100644
--- a/cloud/webfaction/webfaction_domain.py
+++ b/cloud/webfaction/webfaction_domain.py
@@ -47,6 +47,26 @@ options:
         required: true
 '''
 
+EXAMPLES = '''
+  - name: Create a test domain
+    webfaction_domain:
+      name: mydomain.com
+      state: present
+      subdomains:
+       - www
+       - blog
+      login_name: "{{webfaction_user}}"
+      login_password: "{{webfaction_passwd}}"
+
+  - name: Delete test domain and any subdomains
+    webfaction_domain:
+      name: mydomain.com
+      state: absent
+      login_name: "{{webfaction_user}}"
+      login_password: "{{webfaction_passwd}}"
+
+'''
+
 import socket
 import xmlrpclib
 
diff --git a/cloud/webfaction/webfaction_mailbox.py b/cloud/webfaction/webfaction_mailbox.py
index fee5700e50e..87ca1fd1a26 100644
--- a/cloud/webfaction/webfaction_mailbox.py
+++ b/cloud/webfaction/webfaction_mailbox.py
@@ -45,6 +45,16 @@ options:
         required: true
 '''
 
+EXAMPLES = '''
+  - name: Create a mailbox
+    webfaction_mailbox:
+      mailbox_name="mybox"
+      mailbox_password="myboxpw"
+      state=present
+      login_name={{webfaction_user}}
+      login_password={{webfaction_passwd}}
+'''
+
 import socket
 import xmlrpclib
 

From 1c3afeadfc3a68173b652a8c0bf08646cf3ac1ab Mon Sep 17 00:00:00 2001
From: Quentin Stafford-Fraser <quentin@pobox.com>
Date: Tue, 2 Jun 2015 09:25:55 +0100
Subject: [PATCH 6/7] Add GPL notices

---
 cloud/webfaction/webfaction_app.py     | 21 ++++++++++++++++++++-
 cloud/webfaction/webfaction_db.py      | 23 +++++++++++++++++++++--
 cloud/webfaction/webfaction_domain.py  | 21 ++++++++++++++++++++-
 cloud/webfaction/webfaction_mailbox.py | 20 +++++++++++++++++++-
 cloud/webfaction/webfaction_site.py    | 21 ++++++++++++++++++++-
 5 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/cloud/webfaction/webfaction_app.py b/cloud/webfaction/webfaction_app.py
index 20e94a7b5f6..55599bdcca6 100644
--- a/cloud/webfaction/webfaction_app.py
+++ b/cloud/webfaction/webfaction_app.py
@@ -1,10 +1,29 @@
 #! /usr/bin/python
+#
 # Create a Webfaction application using Ansible and the Webfaction API
 #
 # Valid application types can be found by looking here:
 # http://docs.webfaction.com/xmlrpc-api/apps.html#application-types
 #
-# Quentin Stafford-Fraser 2015
+# ------------------------------------------
+#
+# (c) Quentin Stafford-Fraser 2015
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 DOCUMENTATION = '''
 ---
diff --git a/cloud/webfaction/webfaction_db.py b/cloud/webfaction/webfaction_db.py
index 784477c5409..a9ef88b943e 100644
--- a/cloud/webfaction/webfaction_db.py
+++ b/cloud/webfaction/webfaction_db.py
@@ -1,7 +1,26 @@
 #! /usr/bin/python
-# Create webfaction database using Ansible and the Webfaction API
 #
-# Quentin Stafford-Fraser 2015
+# Create a webfaction database using Ansible and the Webfaction API
+#
+# ------------------------------------------
+#
+# (c) Quentin Stafford-Fraser 2015
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 DOCUMENTATION = '''
 ---
diff --git a/cloud/webfaction/webfaction_domain.py b/cloud/webfaction/webfaction_domain.py
index c99a0f23f6d..f2c95897bc5 100644
--- a/cloud/webfaction/webfaction_domain.py
+++ b/cloud/webfaction/webfaction_domain.py
@@ -1,7 +1,26 @@
 #! /usr/bin/python
+#
 # Create Webfaction domains and subdomains using Ansible and the Webfaction API
 #
-# Quentin Stafford-Fraser 2015
+# ------------------------------------------
+#
+# (c) Quentin Stafford-Fraser 2015
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 DOCUMENTATION = '''
 ---
diff --git a/cloud/webfaction/webfaction_mailbox.py b/cloud/webfaction/webfaction_mailbox.py
index 87ca1fd1a26..976a428f3d3 100644
--- a/cloud/webfaction/webfaction_mailbox.py
+++ b/cloud/webfaction/webfaction_mailbox.py
@@ -1,7 +1,25 @@
 #! /usr/bin/python
+#
 # Create webfaction mailbox using Ansible and the Webfaction API
 #
-# Quentin Stafford-Fraser and Andy Baker 2015
+# ------------------------------------------
+# (c) Quentin Stafford-Fraser and Andy Baker 2015
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 DOCUMENTATION = '''
 ---
diff --git a/cloud/webfaction/webfaction_site.py b/cloud/webfaction/webfaction_site.py
index a5be4f5407b..223458faf46 100644
--- a/cloud/webfaction/webfaction_site.py
+++ b/cloud/webfaction/webfaction_site.py
@@ -1,7 +1,26 @@
 #! /usr/bin/python
+#
 # Create Webfaction website using Ansible and the Webfaction API
 #
-# Quentin Stafford-Fraser 2015
+# ------------------------------------------
+#
+# (c) Quentin Stafford-Fraser 2015
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 DOCUMENTATION = '''
 ---

From 80b1b3add239c58582bc71576a5666d81580bff0 Mon Sep 17 00:00:00 2001
From: Quentin Stafford-Fraser <quentin@pobox.com>
Date: Thu, 4 Jun 2015 22:17:16 +0100
Subject: [PATCH 7/7] Webfaction will create a default database user when db is
 created. For symmetry and repeatability, delete it when db is deleted. Add
 missing param to documentation.

---
 cloud/webfaction/webfaction_db.py | 48 ++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/cloud/webfaction/webfaction_db.py b/cloud/webfaction/webfaction_db.py
index a9ef88b943e..1a91d649458 100644
--- a/cloud/webfaction/webfaction_db.py
+++ b/cloud/webfaction/webfaction_db.py
@@ -4,7 +4,7 @@
 #
 # ------------------------------------------
 #
-# (c) Quentin Stafford-Fraser 2015
+# (c) Quentin Stafford-Fraser and Andy Baker 2015
 #
 # This file is part of Ansible
 #
@@ -53,6 +53,12 @@ options:
         required: true
         choices: ['mysql', 'postgresql']
 
+    password:
+        description:
+            - The password for the new database user.
+        required: false
+        default: None
+
     login_name:
         description:
             - The webfaction account to use
@@ -75,6 +81,10 @@ EXAMPLES = '''
       type: mysql
       login_name: "{{webfaction_user}}"
       login_password: "{{webfaction_passwd}}"
+
+  # Note that, for symmetry's sake, deleting a database using
+  # 'state: absent' will also delete the matching user.
+
 '''
 
 import socket
@@ -110,13 +120,17 @@ def main():
     db_map = dict([(i['name'], i) for i in db_list])
     existing_db = db_map.get(db_name)
 
+    user_list = webfaction.list_db_users(session_id)
+    user_map = dict([(i['username'], i) for i in user_list])
+    existing_user = user_map.get(db_name)
+
     result = {}
     
     # Here's where the real stuff happens
 
     if db_state == 'present':
 
-        # Does an app with this name already exist?
+        # Does an database with this name already exist?
         if existing_db:
             # Yes, but of a different type - fail
             if existing_db['db_type'] != db_type:
@@ -129,8 +143,8 @@ def main():
 
 
         if not module.check_mode:
-            # If this isn't a dry run, create the app
-            # print positional_args
+            # If this isn't a dry run, create the db
+            # and default user.
             result.update(
                 webfaction.create_db(
                     session_id, db_name, db_type, db_passwd
@@ -139,17 +153,23 @@ def main():
 
     elif db_state == 'absent':
 
-        # If the app's already not there, nothing changed.
-        if not existing_db:
-            module.exit_json(
-                changed = False,
-            )
-
+        # If this isn't a dry run...
         if not module.check_mode:
-            # If this isn't a dry run, delete the app
-            result.update(
-                webfaction.delete_db(session_id, db_name, db_type)
-            )
+  
+            if not (existing_db or existing_user):
+                module.exit_json(changed = False,)
+                
+            if existing_db:
+                # Delete the db if it exists
+                result.update(
+                    webfaction.delete_db(session_id, db_name, db_type)
+                )
+                    
+            if existing_user:
+                # Delete the default db user if it exists
+                result.update(
+                    webfaction.delete_db_user(session_id, db_name, db_type)
+                )
 
     else:
         module.fail_json(msg="Unknown state specified: {}".format(db_state))