From d083febb887448f2df96a4d7605316fbe6d24f7e Mon Sep 17 00:00:00 2001
From: Martin van Es <martin@mrvanes.com>
Date: Tue, 15 Mar 2022 17:41:08 +0100
Subject: [PATCH] Rename mdserver to mdsigner
---
inventory/group_vars/all.yml | 6 +++---
inventory/inventory | 6 +++---
playbook.yml | 6 +++---
roles/apache/templates/md.conf.j2 | 2 +-
roles/mdserver/templates/mdserver.yaml.j2 | 2 --
roles/{mdserver => mdsigner}/handlers/main.yml | 4 ++--
roles/{mdserver => mdsigner}/tasks/main.yml | 18 +++++++++---------
.../templates/mdsigner.service.j2} | 6 +++---
roles/mdsigner/templates/mdsigner.yaml.j2 | 2 ++
9 files changed, 26 insertions(+), 26 deletions(-)
delete mode 100644 roles/mdserver/templates/mdserver.yaml.j2
rename roles/{mdserver => mdsigner}/handlers/main.yml (58%)
rename roles/{mdserver => mdsigner}/tasks/main.yml (73%)
rename roles/{mdserver/templates/mdserver.service.j2 => mdsigner/templates/mdsigner.service.j2} (66%)
create mode 100644 roles/mdsigner/templates/mdsigner.yaml.j2
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index d379a43..a82eac0 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -7,7 +7,7 @@ hosts:
hostname: srv1
altname: 'server-md2.et2.com'
- mdserver:
+ mdsigner:
test:
signer: hsm_signer
metadir: metadata/test
@@ -24,7 +24,7 @@ hosts:
hostname: srv2
altname: 'server-md2.et2.com'
- mdserver:
+ mdsigner:
edugain:
signer: hsm_signer
metadir: metadata/edugain
@@ -50,7 +50,7 @@ hosts:
hostname: srv4
altname: 'server-md.example.com'
- mdserver:
+ mdsigner:
foobar:
signer: normal_signer
metadir: metadata/test
diff --git a/inventory/inventory b/inventory/inventory
index cbe5ab9..49d8a9d 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -5,8 +5,8 @@ mdxcdn ansible_host=mdxcdn.pt-38.utr.surfcloud.nl ansible_user=ansible
alternative-mdx ansible_host=alternative-mdx.pt-76.utr.surfcloud.nl ansible_user=ansible ansible_ssh_private_key_file=.ssh/id_ansible
okeanos ansible_host=62.217.72.109 ansible_user=ansible ansible_ssh_private_key_file=.ssh/id_ansible
-# Hosts that receive the mdserver role
-[mdserver]
+# Hosts that receive the mdsigner role
+[mdsigner]
et2
mdxcdn
alternative-mdx
@@ -25,6 +25,6 @@ mdxcdn
# All hosts for base role
[all:children]
-mdserver
+mdsigner
mdproxy
geodns
diff --git a/playbook.yml b/playbook.yml
index 33fb74c..f890492 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -10,12 +10,12 @@
roles:
- {role: geodns, tags: ['geodns']}
-- name: MDServer
- hosts: mdserver
+- name: MDSigner
+ hosts: mdsigner
gather_facts: false
roles:
- {role: apache, tags: ['apache']}
- - {role: mdserver, tags: ['mdserver']}
+ - {role: mdsigner, tags: ['mdsigner']}
- name: MDProxy
hosts: mdproxy
diff --git a/roles/apache/templates/md.conf.j2 b/roles/apache/templates/md.conf.j2
index 66ac17b..59ca6d4 100644
--- a/roles/apache/templates/md.conf.j2
+++ b/roles/apache/templates/md.conf.j2
@@ -1,4 +1,4 @@
-{% if hosts[inventory_hostname].get('mdserver') %}
+{% if hosts[inventory_hostname].get('mdsigner') %}
<VirtualHost *:80>
ServerName {{ hosts[inventory_hostname]['hostname'] }}-signer.{{ tld }}
{% if hosts[inventory_hostname].get('altname') %}
diff --git a/roles/mdserver/templates/mdserver.yaml.j2 b/roles/mdserver/templates/mdserver.yaml.j2
deleted file mode 100644
index b8fa37f..0000000
--- a/roles/mdserver/templates/mdserver.yaml.j2
+++ /dev/null
@@ -1,2 +0,0 @@
----
-{{ hosts[inventory_hostname]['mdserver'] | to_yaml }}
diff --git a/roles/mdserver/handlers/main.yml b/roles/mdsigner/handlers/main.yml
similarity index 58%
rename from roles/mdserver/handlers/main.yml
rename to roles/mdsigner/handlers/main.yml
index 8f6dc76..0681b64 100644
--- a/roles/mdserver/handlers/main.yml
+++ b/roles/mdsigner/handlers/main.yml
@@ -1,7 +1,7 @@
---
-- name: enable mdserver job
+- name: enable mdsigner job
systemd:
- name: "mdserver.service"
+ name: "mdsigner.service"
enabled: true
state: "restarted"
daemon_reload: true
diff --git a/roles/mdserver/tasks/main.yml b/roles/mdsigner/tasks/main.yml
similarity index 73%
rename from roles/mdserver/tasks/main.yml
rename to roles/mdsigner/tasks/main.yml
index 3e9970a..d3dd9a3 100644
--- a/roles/mdserver/tasks/main.yml
+++ b/roles/mdsigner/tasks/main.yml
@@ -4,12 +4,12 @@
import_role:
name: alternate-mdx
-- name: Create mdserver config
+- name: Create mdsigner config
ansible.builtin.template:
- src: "mdserver.yaml.j2"
- dest: "{{ altmdx_dir }}/mdserver.yaml"
+ src: "mdsigner.yaml.j2"
+ dest: "{{ altmdx_dir }}/mdsigner.yaml"
notify:
- - "enable mdserver job"
+ - "enable mdsigner job"
- name: Create metadata dir
ansible.builtin.file:
@@ -22,7 +22,7 @@
path: "{{ altmdx_metadir }}/{{ item.key }}"
state: directory
mode: '0755'
- with_dict: "{{ hosts[inventory_hostname]['mdserver'] }}"
+ with_dict: "{{ hosts[inventory_hostname]['mdsigner'] }}"
- name: Check existence of metadata signing cert
stat:
@@ -39,9 +39,9 @@
creates: "{{ altmdx_dir }}/meta.crt"
when: not mdcert.stat.exists
-- name: Copy mdserver service files
+- name: Copy mdsigner service files
ansible.builtin.template:
- src: "mdserver.service.j2"
- dest: "/etc/systemd/system/mdserver.service"
+ src: "mdsigner.service.j2"
+ dest: "/etc/systemd/system/mdsigner.service"
notify:
- - "enable mdserver job"
+ - "enable mdsigner job"
diff --git a/roles/mdserver/templates/mdserver.service.j2 b/roles/mdsigner/templates/mdsigner.service.j2
similarity index 66%
rename from roles/mdserver/templates/mdserver.service.j2
rename to roles/mdsigner/templates/mdsigner.service.j2
index 6c6fb26..b8e8f29 100644
--- a/roles/mdserver/templates/mdserver.service.j2
+++ b/roles/mdsigner/templates/mdsigner.service.j2
@@ -1,15 +1,15 @@
[Unit]
-Description=MDServer
+Description=MDSignerr
After=syslog.target network.target
[Service]
Type=simple
WorkingDirectory={{ altmdx_dir }}
-ExecStart={{ altmdx_dir }}/bin/python -u mdserver.py
+ExecStart={{ altmdx_dir }}/bin/python -u mdsigner.py
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
RestartSec=10
-SyslogIdentifier=mdserver
+SyslogIdentifier=mdsigner
[Install]
WantedBy=multi-user.target
diff --git a/roles/mdsigner/templates/mdsigner.yaml.j2 b/roles/mdsigner/templates/mdsigner.yaml.j2
new file mode 100644
index 0000000..c2259f3
--- /dev/null
+++ b/roles/mdsigner/templates/mdsigner.yaml.j2
@@ -0,0 +1,2 @@
+---
+{{ hosts[inventory_hostname]['mdsigner'] | to_yaml }}
--
GitLab