Merge branch 'release/0.8.1'

StarterSquad · Feb 15, 2015 · 6eddef4 · 6eddef4
2 parents 0911227 + ec11481
commit 6eddef4
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 28 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2014  Tiziano Perrucci @ StarterSquad
+Copyright (c) 2013-2015  Tiziano Perrucci @ StarterSquad
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/examples/provision-vagrant-vm.sh b/examples/provision-vagrant-vm.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+prudentia vagrant <<-EOF
+  register
+  ${PWD}/boxes/tasks.yml
+  mybox
+  10.0.0.17
+  1
+
+  provision mybox
+EOF
diff --git a/prudentia/__init__.py b/prudentia/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.8'
+__version__ = '0.8.1'
 __author__ = 'Tiziano Perrucci'
 
 

diff --git a/prudentia/cli.py b/prudentia/cli.py
@@ -56,7 +56,7 @@ def do_use(self, env, *args):
 
         # If this function was called inside a cmd loop the return values indicates whether execution will be terminated
         # returning False will cause interpretation to continue.
-        # Otherwise the return value is the result of the provisioning command.
+        # Otherwise the return value is the result of the 'provision' action.
         return False if self.parent_loop else result
 
     def do_EOF(self, line):

diff --git a/prudentia/digital_ocean.py b/prudentia/digital_ocean.py
@@ -21,7 +21,7 @@ def __init__(self):
 class DigitalOceanProvider(FactoryProvider):
     NAME = 'digital-ocean'
 
-    DEFAULT_IMAGE_ID = 6918990  # Ubuntu 14.04 x64
+    DEFAULT_IMAGE_ID = 9801950  # Ubuntu 14.04 x64
     DEFAULT_SIZE_ID = 63  # 1GB
     DEFAULT_REGION_ID = 5  # Amsterdam 2
 

diff --git a/prudentia/files/postgres/apt-source b/prudentia/files/postgres/apt-source
diff --git a/prudentia/files/tor/apt-source b/prudentia/files/tor/apt-source
@@ -0,0 +1 @@
+deb http://deb.torproject.org/torproject.org precise main
diff --git a/prudentia/tasks/postgres_9.3.yml → prudentia/tasks/postgresql.yml b/prudentia/tasks/postgres_9.3.yml → prudentia/tasks/postgresql.yml
@@ -1,6 +1,10 @@
 ---
   # Parameters:
   #  prudentia_dir (provided)
+  #  postgresql_apt_key_id (provided)
+  #  postgresql_apt_key_url (provided)
+  #  postgresql_apt_repository (provided)
+  #  postgresql_version (provided)
 
   - name: PostgreSQL | Check if is installed
     command: test -x /usr/bin/psql
@@ -9,27 +13,29 @@
     ignore_errors: yes
     tags: psql
 
-  - name: PostgreSQL | Add GPG key to apt keyring
-    shell: wget -q -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  - name: PostgreSQL | Add apt repository key
+    apt_key: id={{postgresql_apt_key_id}} url={{postgresql_apt_key_url}} state=present
     when: ansible_os_family == "Debian"
     when: psql_present|failed
-    tags: psql
     sudo: yes
+    tags: psql
 
   - name: PostgreSQL | Add apt repository
-    copy: src={{prudentia_dir}}/files/postgres/apt-source dest=/etc/apt/sources.list.d/postgresql.list mode=644
+    apt_repository: repo="{{postgresql_apt_repository}}" state=present
     when: ansible_os_family == "Debian"
-    tags: psql
     when: psql_present|failed
     sudo: yes
+    tags: psql
 
   - name: PostgreSQL | Install
     apt: update-cache=yes force=yes state=present pkg={{item}}
-    when: ansible_os_family == "Debian"
     with_items:
-      - postgresql-9.3
       - libpq-dev
       - python-psycopg2
-    sudo: yes
+      - postgresql-{{postgresql_version}}
+      - postgresql-client-{{postgresql_version}}
+      - postgresql-contrib-{{postgresql_version}}
+    when: ansible_os_family == "Debian"
     when: psql_present|failed
+    sudo: yes
     tags: psql
diff --git a/prudentia/tasks/sbt_0.13.yml → prudentia/tasks/sbt.yml b/prudentia/tasks/sbt_0.13.yml → prudentia/tasks/sbt.yml
@@ -1,6 +1,9 @@
 ---
   # Parameters:
   #  prudentia_dir (provided)
+  #  sbt_base_url (provided)
+  #  sbt_version (provided)
+  #  sbt_artifact (provided)
 
   - include: "{{prudentia_dir}}/tasks/java7.yml"
     tags: sbt
@@ -12,20 +15,20 @@
     register: sbt_present
     tags: sbt
 
-  - name: SBT | Download 0.13.5
-    get_url: url=http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/0.13.5/sbt.deb dest=/opt/sbt.0.13.5.deb
+  - name: SBT | Download
+    get_url: url={{sbt_base_url}}/{{sbt_artifact}} dest=/opt/{{sbt_artifact}}
     when: ansible_os_family == "Debian" and sbt_present|failed
-    tags: sbt
     sudo: yes
+    tags: sbt
 
   - name: SBT | Install
-    command: dpkg -i /opt/sbt.0.13.5.deb
+    command: dpkg -i /opt/{{sbt_artifact}}
     when: ansible_os_family == "Debian" and sbt_present|failed
-    tags: sbt
     sudo: yes
+    tags: sbt
 
   - name: SBT | Remove installer
-    file: path=/opt/sbt.0.13.5.deb state=absent
+    file: path=/opt/{{sbt_artifact}} state=absent
     when: ansible_os_family == "Debian" and sbt_present|failed
     tags: sbt
     sudo: yes
diff --git a/prudentia/tasks/ssh-key.yml b/prudentia/tasks/ssh-key.yml
@@ -7,7 +7,7 @@
   #  key_name
 
   - name: SSH | Create .ssh directory
-    file: dest={{ssh_dir}}/.ssh state=directory mode=700 owner={{ssh_user}} group={{ssh_group}}
+    file: path={{ssh_dir}}/.ssh state=directory mode=700 owner={{ssh_user}} group={{ssh_group}}
     sudo: yes
     tags: ssh
 
@@ -21,12 +21,7 @@
     sudo: yes
     tags: ssh
 
-  - name: SSH | Touch known_hosts
-    command: touch {{ssh_dir}}/.ssh/known_hosts
-    sudo: yes
-    tags: ssh
-
-  - name: SSH | Set permission known_hosts
-    file: path={{ssh_dir}}/.ssh/known_hosts mode=644 state=file owner={{ssh_user}} group={{ssh_group}}
+  - name: SSH | Touch and set permission of known_hosts
+    file: path={{ssh_dir}}/.ssh/known_hosts state=touch mode=644 owner={{ssh_user}} group={{ssh_group}}
     sudo: yes
     tags: ssh
diff --git a/prudentia/tasks/tor.yml b/prudentia/tasks/tor.yml
@@ -6,10 +6,11 @@
     command: test -x /usr/sbin/tor
     when: ansible_system == "Linux"
     register: tor_present
+    ignore_errors: yes
     tags: tor
 
   - name: Tor | Add apt repository
-    copy: src={{prudentia_dir}}/components/worky/files/tor-apt-source dest=/etc/apt/sources.list.d/tor.list mode=644
+    copy: src={{prudentia_dir}}/files/tor/apt-source dest=/etc/apt/sources.list.d/tor.list mode=644
     when: ansible_os_family == "Debian" and tor_present|failed
     tags: tor
     sudo: yes

diff --git a/prudentia/vars/global.yml b/prudentia/vars/global.yml
@@ -1,6 +1,15 @@
 ---
   testing: "{{ ansible_user_id == 'vagrant' }}"
 
+  sbt_base_url: https://dl.bintray.com/sbt/debian
+  sbt_version: 0.13.7
+  sbt_artifact: sbt-{{sbt_version}}.deb
+
   nvm_version: v0.22.0
   node_version: v0.10.35
   node_path: '{{ansible_env.HOME}}/.nvm/{{node_version}}'
+
+  postgresql_apt_key_id: ACCC4CF8
+  postgresql_apt_key_url: "https://www.postgresql.org/media/keys/{{postgresql_apt_key_id}}.asc"
+  postgresql_apt_repository: 'deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main'
+  postgresql_version: 9.4