From 84b940b54a1bebdda3e415782aab1402d6843bce Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 23 Mar 2015 12:24:36 +0100 Subject: Rename the server --- host_vars/new.theopensourceway.org/git_repos.yml | 5 ----- host_vars/os1.theopensourceway.org/git_repos.yml | 5 +++++ hosts | 2 +- playbooks/new.theopensourceway.org.yml | 22 ---------------------- playbooks/os1.theopensourceway.org.yml | 22 ++++++++++++++++++++++ 5 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 host_vars/new.theopensourceway.org/git_repos.yml create mode 100644 host_vars/os1.theopensourceway.org/git_repos.yml delete mode 100644 playbooks/new.theopensourceway.org.yml create mode 100644 playbooks/os1.theopensourceway.org.yml diff --git a/host_vars/new.theopensourceway.org/git_repos.yml b/host_vars/new.theopensourceway.org/git_repos.yml deleted file mode 100644 index 93f23c8..0000000 --- a/host_vars/new.theopensourceway.org/git_repos.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -git_repositories_dir: /srv/git_repos -git_repositories: -- { name: private, desc: "Ansible private password repository", private: yes, owner: mscherer@redhat.com, group: admins } -- { name: public, desc: "Ansible configuration for the server", url: ansible, owner: mscherer@redhat.com, group: admins } diff --git a/host_vars/os1.theopensourceway.org/git_repos.yml b/host_vars/os1.theopensourceway.org/git_repos.yml new file mode 100644 index 0000000..93f23c8 --- /dev/null +++ b/host_vars/os1.theopensourceway.org/git_repos.yml @@ -0,0 +1,5 @@ +--- +git_repositories_dir: /srv/git_repos +git_repositories: +- { name: private, desc: "Ansible private password repository", private: yes, owner: mscherer@redhat.com, group: admins } +- { name: public, desc: "Ansible configuration for the server", url: ansible, owner: mscherer@redhat.com, group: admins } diff --git a/hosts b/hosts index 2567d71..357260c 100644 --- a/hosts +++ b/hosts @@ -2,4 +2,4 @@ 66.35.48.40 ansible_ssh_user=misc ansible_sudo=yes ansible_ssh_port=108 [new] -new.theopensourceway.org ansible_ssh_user=root +os1.theopensourceway.org ansible_ssh_user=root diff --git a/playbooks/new.theopensourceway.org.yml b/playbooks/new.theopensourceway.org.yml deleted file mode 100644 index 029cf93..0000000 --- a/playbooks/new.theopensourceway.org.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- hosts: new.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_url: www.theopensourceway.org - document_root: /var/www/website - - role: old_wiki - old_wiki_dir: /var/www/old_server/wiki/ - website_url: www.theopensourceway.org - - deploy_website - - mailman_lists - - cgit diff --git a/playbooks/os1.theopensourceway.org.yml b/playbooks/os1.theopensourceway.org.yml new file mode 100644 index 0000000..6b7f390 --- /dev/null +++ b/playbooks/os1.theopensourceway.org.yml @@ -0,0 +1,22 @@ +--- +- 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_url: www.theopensourceway.org + document_root: /var/www/website + - role: old_wiki + old_wiki_dir: /var/www/old_server/wiki/ + website_url: www.theopensourceway.org + - deploy_website + - mailman_lists + - cgit -- cgit