From ba46305ac81315ede5db90eff2bd5890af2e2367 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@redhat.com>
Date: Mon, 16 Oct 2017 22:21:58 +0200
Subject: Fix the playbook after the migration out of os1

---
 hosts                                   |  7 ++-----
 playbooks/os1.theopensourceway.org.yml  | 26 --------------------------
 playbooks/osci.theopensourceway.org.yml | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 31 deletions(-)
 delete mode 100644 playbooks/os1.theopensourceway.org.yml
 create mode 100644 playbooks/osci.theopensourceway.org.yml

diff --git a/hosts b/hosts
index 357260c..fe58950 100644
--- a/hosts
+++ b/hosts
@@ -1,5 +1,2 @@
-[old]
-66.35.48.40 ansible_ssh_user=misc ansible_sudo=yes ansible_ssh_port=108
-
-[new]
-os1.theopensourceway.org ansible_ssh_user=root
+[osci]
+osci.theopensourceway.org ansible_ssh_user=root
diff --git a/playbooks/os1.theopensourceway.org.yml b/playbooks/os1.theopensourceway.org.yml
deleted file mode 100644
index 8fa9322..0000000
--- a/playbooks/os1.theopensourceway.org.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- hosts: os1.theopensourceway.org
-  vars:
-    mailman_webinterface: lists.theopensourceway.org
-    mailman_prefix: theopensourceway.org
-    mailman_lists:
-    - { name: infrastructure, owner: mscherer@redhat.com}
-    - { name: metrics-wg, owner: mscherer@redhat.com}
-    - { name: oss-consulting-wg, owner: mscherer@redhat.com}
-  roles:
-  - base
-  - admin_ssh_keys
-  - local_deploy
-  - role: httpd
-    website_domain: www.theopensourceway.org
-    document_root: /var/www/website
-  - role: httpd
-    website_domain: theopensourceway.org
-    redirect: http://www.theopensourceway.org/
-  - role: old_wiki
-    old_wiki_dir: /var/www/old_server/wiki/
-    website_url: www.theopensourceway.org
-  - deploy_website
-  - mailman_lists
-  - cgit
-  - mediawiki
diff --git a/playbooks/osci.theopensourceway.org.yml b/playbooks/osci.theopensourceway.org.yml
new file mode 100644
index 0000000..8d35e39
--- /dev/null
+++ b/playbooks/osci.theopensourceway.org.yml
@@ -0,0 +1,26 @@
+---
+- hosts: osci.theopensourceway.org
+  vars:
+    mailman_webinterface: lists.theopensourceway.org
+    mailman_prefix: theopensourceway.org
+    mailman_lists:
+    - { name: infrastructure, owner: mscherer@redhat.com}
+    - { name: metrics-wg, owner: mscherer@redhat.com}
+    - { name: oss-consulting-wg, owner: mscherer@redhat.com}
+  roles:
+  - base
+  - admin_ssh_keys
+  - local_deploy
+  - role: httpd
+    website_domain: www.theopensourceway.org
+    document_root: /var/www/website
+  - role: httpd
+    website_domain: theopensourceway.org
+    redirect: http://www.theopensourceway.org/
+  - role: old_wiki
+    old_wiki_dir: /var/www/old_server/wiki/
+    website_url: www.theopensourceway.org
+  - deploy_website
+  - mailman_lists
+  - cgit
+  - mediawiki
-- 
cgit