From 53d2eaf401a37929468293869ba276ac297508d4 Mon Sep 17 00:00:00 2001
From: franklin <kevin@franklinkim.de>
Date: Tue, 14 May 2019 17:29:13 +0200
Subject: [PATCH] feat: rename role

---
 .travis.yml     |  2 +-
 Makefile        |  2 +-
 README.md       | 18 +++++++++++-------
 meta/readme.yml |  8 ++++++--
 tests/main.yml  |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7691fa..6c560e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ services:
   - docker
 env:
   global:
-    - role: franklinkim.apache2
+    - role: weareinteractive.apache2
   matrix:
     - distribution: Ubuntu
       distribution_version: "18.04"
diff --git a/Makefile b/Makefile
index acc54ac..7f1c1b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PWD=$(shell pwd)
-ROLE_NAME=franklinkim.apache2
+ROLE_NAME=weareinteractive.apache2
 ROLE_PATH=/etc/ansible/roles/$(ROLE_NAME)
 TEST_VERSION=ansible --version
 TEST_DEPS=ansible-galaxy install -c weareinteractive.apt weareinteractive.openssl weareinteractive.htpasswd
diff --git a/README.md b/README.md
index e79aee8..d8e09b5 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# Ansible franklinkim.apache2 role
+# Ansible weareinteractive.apache2 role
 
 [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-apache2.svg)](https://travis-ci.org/weareinteractive/ansible-apache2)
-[![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.apache2-blue.svg)](https://galaxy.ansible.com/list#/roles/1364)
+[![Galaxy](https://img.shields.io/badge/galaxy-weareinteractive.apache2-blue.svg)](https://galaxy.ansible.com/weareinteractive/apache2)
 [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-apache2.svg)](https://github.com/weareinteractive/ansible-apache2)
 [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-apache2.svg)](https://github.com/weareinteractive/ansible-apache2)
 
-> `franklinkim.apache2` is an [Ansible](http://www.ansible.com) role which:
+> `weareinteractive.apache2` is an [Ansible](http://www.ansible.com) role which:
 >
 > * installs apache2
 > * configures apache2
@@ -17,24 +17,28 @@
 > * adds rules
 > * configures service
 
+**Note:**
+
+> Since Ansible Galaxy supports [organization](https://www.ansible.com/blog/ansible-galaxy-2-release) now, this role has moved from `franklinkim.apache2` to `weareinteractive.apache2`!
+
 ## Installation
 
 Using `ansible-galaxy`:
 
 ```shell
-$ ansible-galaxy install franklinkim.apache2
+$ ansible-galaxy install weareinteractive.apache2
 ```
 
 Using `requirements.yml`:
 
 ```yaml
-- src: franklinkim.apache2
+- src: weareinteractive.apache2
 ```
 
 Using `git`:
 
 ```shell
-$ git clone https://github.com/weareinteractive/ansible-apache2.git franklinkim.apache2
+$ git clone https://github.com/weareinteractive/ansible-apache2.git weareinteractive.apache2
 ```
 
 ## Dependencies
@@ -173,7 +177,7 @@ This is an example playbook:
     - weareinteractive.apt
     - weareinteractive.openssl
     - weareinteractive.htpasswd
-    - franklinkim.apache2
+    - weareinteractive.apache2
   vars:
     htpasswd:
       - name: foobar
diff --git a/meta/readme.yml b/meta/readme.yml
index 3e0a78f..01d89c3 100644
--- a/meta/readme.yml
+++ b/meta/readme.yml
@@ -1,11 +1,11 @@
 ---
 
-galaxy_name: franklinkim.apache2
+galaxy_name: weareinteractive.apache2
 github_user: weareinteractive
 github_name: ansible-apache2
 badges: |
   [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-apache2.svg)](https://travis-ci.org/weareinteractive/ansible-apache2)
-  [![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.apache2-blue.svg)](https://galaxy.ansible.com/list#/roles/1364)
+  [![Galaxy](https://img.shields.io/badge/galaxy-weareinteractive.apache2-blue.svg)](https://galaxy.ansible.com/weareinteractive/apache2)
   [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-apache2.svg)](https://github.com/weareinteractive/ansible-apache2)
   [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-apache2.svg)](https://github.com/weareinteractive/ansible-apache2)
 description: |
@@ -18,6 +18,10 @@ description: |
   > * optionally removes default host
   > * adds rules
   > * configures service
+
+  **Note:**
+
+  > Since Ansible Galaxy supports [organization](https://www.ansible.com/blog/ansible-galaxy-2-release) now, this role has moved from `franklinkim.apache2` to `weareinteractive.apache2`!
 after_handlers: |
   ## Rules
 
diff --git a/tests/main.yml b/tests/main.yml
index 67b8743..ec86dcc 100644
--- a/tests/main.yml
+++ b/tests/main.yml
@@ -11,7 +11,7 @@
     - weareinteractive.apt
     - weareinteractive.openssl
     - weareinteractive.htpasswd
-    - franklinkim.apache2
+    - weareinteractive.apache2
   vars:
     htpasswd:
       - name: foobar