From 703a046572bd2c06429c41326abf9d410a41db3e Mon Sep 17 00:00:00 2001
From: Alejandro Moreno <alex@vanessas-air.home>
Date: Wed, 10 Feb 2016 20:40:31 +0000
Subject: [PATCH 1/2] First temptative to create a new ansible galaxy role

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 README.md                                     |  66 +++++----
 Vagrantfile                                   |  13 --
 .../jiv_e.solr/defaults => defaults}/main.yml |   0
 .../jiv_e.solr/handlers => handlers}/main.yml |   0
 hosts                                         |   1 -
 meta/main.yml                                 | 134 ++++++++++++++++++
 play.yml                                      |   8 --
 .../configure-drupal-cores.yml                |   0
 .../tasks => tasks}/install-solr.yml          |   0
 {roles/jiv_e.solr/tasks => tasks}/main.yml    |   2 -
 .../tasks => tasks}/uninstall-solr.yml        |   0
 .../templates => templates}/4.x/elevate.xml   |   0
 .../4.x/mapping-ISOLatin1Accent.txt           |   0
 .../templates => templates}/4.x/protwords.txt |   0
 .../templates => templates}/4.x/schema.xml    |   0
 .../4.x/schema_extra_fields.xml               |   0
 .../4.x/schema_extra_types.xml                |   0
 .../4.x/solrconfig.xml                        |   0
 .../4.x/solrconfig_extra.xml                  |   0
 .../4.x/solrcore.properties                   |   0
 .../templates => templates}/4.x/stopwords.txt |   0
 .../templates => templates}/4.x/synonyms.txt  |   0
 .../core.properties.j2                        |   0
 .../iptables/solr-allowed-hosts.j2            |   0
 .../templates => templates}/solr-init.d.sh.j2 |   0
 .../templates => templates}/solr.xml.j2       |   0
 tests/inventory                               |   1 +
 tests/test.yml                                |   5 +
 29 files changed, 181 insertions(+), 49 deletions(-)
 create mode 100644 .DS_Store
 delete mode 100644 Vagrantfile
 rename {roles/jiv_e.solr/defaults => defaults}/main.yml (100%)
 rename {roles/jiv_e.solr/handlers => handlers}/main.yml (100%)
 delete mode 100644 hosts
 create mode 100644 meta/main.yml
 delete mode 100644 play.yml
 rename {roles/jiv_e.solr/tasks => tasks}/configure-drupal-cores.yml (100%)
 rename {roles/jiv_e.solr/tasks => tasks}/install-solr.yml (100%)
 rename {roles/jiv_e.solr/tasks => tasks}/main.yml (99%)
 rename {roles/jiv_e.solr/tasks => tasks}/uninstall-solr.yml (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/elevate.xml (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/mapping-ISOLatin1Accent.txt (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/protwords.txt (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/schema.xml (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/schema_extra_fields.xml (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/schema_extra_types.xml (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/solrconfig.xml (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/solrconfig_extra.xml (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/solrcore.properties (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/stopwords.txt (100%)
 rename {roles/jiv_e.solr/templates => templates}/4.x/synonyms.txt (100%)
 rename {roles/jiv_e.solr/templates => templates}/core.properties.j2 (100%)
 rename {roles/jiv_e.solr/templates => templates}/iptables/solr-allowed-hosts.j2 (100%)
 rename {roles/jiv_e.solr/templates => templates}/solr-init.d.sh.j2 (100%)
 rename {roles/jiv_e.solr/templates => templates}/solr.xml.j2 (100%)
 create mode 100644 tests/inventory
 create mode 100644 tests/test.yml

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bc93d69423ea721f4ccef79f9f23b2166803c3a9
GIT binary patch
literal 6148
zcmeHKK~BR!44f@Rq~g*e$Go5tFCdimPzgBD573e#5Gh5pJ#fpncmR*!DV$(zuS$}_
z6%eu|dp5iF#yh);vj9SWogV^S00~vF)uH)9WL$JhTCqn4gU+!=ffbgcVsW+Q?HzxS
z0o&XhGhAbW%KlA@#gqxl!FZ;=y{qUF65P=D9yxb=hDY1)PycY#@ZZBJMmWI`=NMxs
zr=#Ni((q33z<DQlLXSE}QTLZ@!fhp+4lX$JF$Opz_85`ZBP5?%#4dAQXzqGa>$x;M
zSIlIIyXG1-i`QBfD{?W9xl6k_w`5U`P%7Ox1I~am@GA_kW{V{IhHjk!XTTZQFd*ND
zlq#4-EDiP3L8DgyVw>G6Y|AgB#H10kh@~M%D8WLB78>FeBUm{5)99B)EDbFjAznU0
zd~=95l%Q|t{HeMlWQJ~?0cW7jz>Yn3rT!1UzyH^R{K*+`2L2TTp*<K6`dm`1ty_ze
tTANZYsUqT68g4?^&{9laDa8j=751mnAZ8IuL-tVoM?h(C;|%;L10RX6cxnIu

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index c086d7a..27edffa 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,49 @@
+Role Name
+=========
 Ansible role for installing multicore Apache Solr
-===============================================
+
 This playbook is based on a great tutorial written by 2bits.
 
 http://2bits.com/articles/configuring-apache-solr-4x-drupal-password-authentication.html
 
 Thanks guys!
 
+Requirements
+------------
+
+* Ansible (tested on 1.6)
+  - http://docs.ansible.com/intro_installation.html
+* Ubuntu (tested on 12.04 LTS)
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
+
 Disclaimer
 ----------
 Even if the script does some security related configuration I don't guarantee
@@ -22,34 +60,12 @@ Provides
   - Installation path
   - Configuring core names and types (default/drupal)
 * Support for Drupal's Solr modules (apachesolr/search\_api\_solr)
-  - Solr version 4.x only 
+  - Solr version 4.x only
   - Config files are fetched from search\_api\_solr/solr-conf/4.x
 * Vagrantfile for testing and development
 * Ansible hosts file that points to the Vagrant box
 
-Requires
-------------
-* Ansible (tested on 1.6)
-  - http://docs.ansible.com/intro_installation.html
-* Ubuntu (tested on 12.04 LTS)
-* Vagrant (*optional*, tested on 1.5.1)
-  - https://docs.vagrantup.com/v2/getting-started/index.html
-
-Usage - Vagrant
--------------
-1. Clone the repository
-2. Cd to the cloned folder and run:
-  ```
-  $ vagrant up
-  ```
-3. Run
-  ```
-  $ ansible-playbook -i hosts play.yml --private-key=~/.vagrant.d/insecure_private_key
-  ```
-4. After the script is run wait for a while for Apache Solr to start
-4. Navigate to http://192.168.56.107:8983/solr with your browser
-
-Usage - Remote server
+Usage
 ---------------------
 1. Clone the repository
 2. Cd to the cloned folder
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index cded173..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-  config.vm.network :forwarded_port, guest: 8983, host: 8983
-  config.vm.network "private_network", ip: "192.168.56.107"
-  config.vm.provider "virtualbox" do |v|
-    v.customize ["modifyvm", :id, "--cpus", "2"]
-    v.customize ["modifyvm", :id, "--memory", "1024"]
-  end
-end
diff --git a/roles/jiv_e.solr/defaults/main.yml b/defaults/main.yml
similarity index 100%
rename from roles/jiv_e.solr/defaults/main.yml
rename to defaults/main.yml
diff --git a/roles/jiv_e.solr/handlers/main.yml b/handlers/main.yml
similarity index 100%
rename from roles/jiv_e.solr/handlers/main.yml
rename to handlers/main.yml
diff --git a/hosts b/hosts
deleted file mode 100644
index cb41459..0000000
--- a/hosts
+++ /dev/null
@@ -1 +0,0 @@
-192.168.56.107 
diff --git a/meta/main.yml b/meta/main.yml
new file mode 100644
index 0000000..94908f6
--- /dev/null
+++ b/meta/main.yml
@@ -0,0 +1,134 @@
+galaxy_info:
+  author:
+  description:
+
+  license: license (GPLv2)
+
+  min_ansible_version: 1.2
+
+
+  #
+  # Below are all platforms currently available. Just uncomment
+  # the ones that apply to your role. If you don't see your
+  # platform on this list, let us know and we'll get it added!
+  #
+  #platforms:
+  #- name: EL
+  #  versions:
+  #  - all
+  #  - 5
+  #  - 6
+  #  - 7
+  #- name: GenericUNIX
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Solaris
+  #  versions:
+  #  - all
+  #  - 10
+  #  - 11.0
+  #  - 11.1
+  #  - 11.2
+  #  - 11.3
+  #- name: Fedora
+  #  versions:
+  #  - all
+  #  - 16
+  #  - 17
+  #  - 18
+  #  - 19
+  #  - 20
+  #  - 21
+  #  - 22
+  #  - 23
+  #- name: Windows
+  #  versions:
+  #  - all
+  #  - 2012R2
+  #- name: SmartOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: opensuse
+  #  versions:
+  #  - all
+  #  - 12.1
+  #  - 12.2
+  #  - 12.3
+  #  - 13.1
+  #  - 13.2
+  #- name: Amazon
+  #  versions:
+  #  - all
+  #  - 2013.03
+  #  - 2013.09
+  #- name: GenericBSD
+  #  versions:
+  #  - all
+  #  - any
+  #- name: FreeBSD
+  #  versions:
+  #  - all
+  #  - 10.0
+  #  - 10.1
+  #  - 10.2
+  #  - 8.0
+  #  - 8.1
+  #  - 8.2
+  #  - 8.3
+  #  - 8.4
+  #  - 9.0
+  #  - 9.1
+  #  - 9.1
+  #  - 9.2
+  #  - 9.3
+  #- name: Ubuntu
+  #  versions:
+  #  - all
+  #  - lucid
+  #  - maverick
+  #  - natty
+  #  - oneiric
+  #  - precise
+  #  - quantal
+  #  - raring
+  #  - saucy
+  #  - trusty
+  #  - utopic
+  #  - vivid
+  #- name: SLES
+  #  versions:
+  #  - all
+  #  - 10SP3
+  #  - 10SP4
+  #  - 11
+  #  - 11SP1
+  #  - 11SP2
+  #  - 11SP3
+  #- name: GenericLinux
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Debian
+  #  versions:
+  #  - all
+  #  - etch
+  #  - jessie
+  #  - lenny
+  #  - squeeze
+  #  - wheezy
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is
+    # a keyword that describes and categorizes the role.
+    # Users find roles by searching for tags. Be sure to
+    # remove the '[]' above if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of
+    # alphanumeric characters. Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line.
+  # Be sure to remove the '[]' above if you add dependencies
+  # to this list.
diff --git a/play.yml b/play.yml
deleted file mode 100644
index 29fca1d..0000000
--- a/play.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Test roles 
-  hosts: all 
-  remote_user: vagrant 
-  sudo: True
-
-  roles:
-    - jiv_e.solr
diff --git a/roles/jiv_e.solr/tasks/configure-drupal-cores.yml b/tasks/configure-drupal-cores.yml
similarity index 100%
rename from roles/jiv_e.solr/tasks/configure-drupal-cores.yml
rename to tasks/configure-drupal-cores.yml
diff --git a/roles/jiv_e.solr/tasks/install-solr.yml b/tasks/install-solr.yml
similarity index 100%
rename from roles/jiv_e.solr/tasks/install-solr.yml
rename to tasks/install-solr.yml
diff --git a/roles/jiv_e.solr/tasks/main.yml b/tasks/main.yml
similarity index 99%
rename from roles/jiv_e.solr/tasks/main.yml
rename to tasks/main.yml
index 7b87d98..bfc4a11 100644
--- a/roles/jiv_e.solr/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,5 +10,3 @@
 - name: If updateSolr variable is set to uninstall the Apache Solr instance
   include: uninstall-solr.yml
   when: jiv_solr__uninstall
-
-
diff --git a/roles/jiv_e.solr/tasks/uninstall-solr.yml b/tasks/uninstall-solr.yml
similarity index 100%
rename from roles/jiv_e.solr/tasks/uninstall-solr.yml
rename to tasks/uninstall-solr.yml
diff --git a/roles/jiv_e.solr/templates/4.x/elevate.xml b/templates/4.x/elevate.xml
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/elevate.xml
rename to templates/4.x/elevate.xml
diff --git a/roles/jiv_e.solr/templates/4.x/mapping-ISOLatin1Accent.txt b/templates/4.x/mapping-ISOLatin1Accent.txt
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/mapping-ISOLatin1Accent.txt
rename to templates/4.x/mapping-ISOLatin1Accent.txt
diff --git a/roles/jiv_e.solr/templates/4.x/protwords.txt b/templates/4.x/protwords.txt
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/protwords.txt
rename to templates/4.x/protwords.txt
diff --git a/roles/jiv_e.solr/templates/4.x/schema.xml b/templates/4.x/schema.xml
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/schema.xml
rename to templates/4.x/schema.xml
diff --git a/roles/jiv_e.solr/templates/4.x/schema_extra_fields.xml b/templates/4.x/schema_extra_fields.xml
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/schema_extra_fields.xml
rename to templates/4.x/schema_extra_fields.xml
diff --git a/roles/jiv_e.solr/templates/4.x/schema_extra_types.xml b/templates/4.x/schema_extra_types.xml
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/schema_extra_types.xml
rename to templates/4.x/schema_extra_types.xml
diff --git a/roles/jiv_e.solr/templates/4.x/solrconfig.xml b/templates/4.x/solrconfig.xml
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/solrconfig.xml
rename to templates/4.x/solrconfig.xml
diff --git a/roles/jiv_e.solr/templates/4.x/solrconfig_extra.xml b/templates/4.x/solrconfig_extra.xml
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/solrconfig_extra.xml
rename to templates/4.x/solrconfig_extra.xml
diff --git a/roles/jiv_e.solr/templates/4.x/solrcore.properties b/templates/4.x/solrcore.properties
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/solrcore.properties
rename to templates/4.x/solrcore.properties
diff --git a/roles/jiv_e.solr/templates/4.x/stopwords.txt b/templates/4.x/stopwords.txt
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/stopwords.txt
rename to templates/4.x/stopwords.txt
diff --git a/roles/jiv_e.solr/templates/4.x/synonyms.txt b/templates/4.x/synonyms.txt
similarity index 100%
rename from roles/jiv_e.solr/templates/4.x/synonyms.txt
rename to templates/4.x/synonyms.txt
diff --git a/roles/jiv_e.solr/templates/core.properties.j2 b/templates/core.properties.j2
similarity index 100%
rename from roles/jiv_e.solr/templates/core.properties.j2
rename to templates/core.properties.j2
diff --git a/roles/jiv_e.solr/templates/iptables/solr-allowed-hosts.j2 b/templates/iptables/solr-allowed-hosts.j2
similarity index 100%
rename from roles/jiv_e.solr/templates/iptables/solr-allowed-hosts.j2
rename to templates/iptables/solr-allowed-hosts.j2
diff --git a/roles/jiv_e.solr/templates/solr-init.d.sh.j2 b/templates/solr-init.d.sh.j2
similarity index 100%
rename from roles/jiv_e.solr/templates/solr-init.d.sh.j2
rename to templates/solr-init.d.sh.j2
diff --git a/roles/jiv_e.solr/templates/solr.xml.j2 b/templates/solr.xml.j2
similarity index 100%
rename from roles/jiv_e.solr/templates/solr.xml.j2
rename to templates/solr.xml.j2
diff --git a/tests/inventory b/tests/inventory
new file mode 100644
index 0000000..d18580b
--- /dev/null
+++ b/tests/inventory
@@ -0,0 +1 @@
+localhost
\ No newline at end of file
diff --git a/tests/test.yml b/tests/test.yml
new file mode 100644
index 0000000..9afa45a
--- /dev/null
+++ b/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - acme
\ No newline at end of file

From d496b38da129c989d1a9c7bf9ab78daeb6fc333b Mon Sep 17 00:00:00 2001
From: Alex Moreno <alejandro.moreno@tdo.es>
Date: Wed, 10 Feb 2016 20:54:38 +0000
Subject: [PATCH 2/2] Added tests

---
 tasks/main.yml | 4 ----
 tests/test.yml | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index bfc4a11..5b2872a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,8 @@
----
-# Installing
 
 - name: Install Apache Solr
   include: install-solr.yml
   when: not jiv_solr__uninstall
 
-# Uninstalling
-
 - name: If updateSolr variable is set to uninstall the Apache Solr instance
   include: uninstall-solr.yml
   when: jiv_solr__uninstall
diff --git a/tests/test.yml b/tests/test.yml
index 9afa45a..5d91e3e 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,5 +1,5 @@
----
 - hosts: localhost
-  remote_user: root
-  roles:
-    - acme
\ No newline at end of file
+  vars_files:
+    - '../defaults/main.yml'
+  tasks:
+    - include: '../tasks/main.yml'