Skip to content

Commit 27a4812

Browse files
committed
Parameterize all service configuration with minecraft_service_name
1 parent bc43dfd commit 27a4812

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ minecraft_whitelist: []
1313
minecraft_ops: []
1414
minecraft_banned_players: []
1515
minecraft_banned_ips: []
16-
minecraft_console_fifo: /run/minecraft/console
16+
minecraft_console_fifo: /run/{{ minecraft_service_name }}/console
1717
minecraft_console_fifo_mode: '0666'
1818
minecraft_process_control: systemd
1919
minecraft_server_properties: {}

handlers/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
- name: restart Minecraft (systemd)
2020
service:
21-
name=minecraft
21+
name={{ minecraft_service_name}}
2222
state=restarted
2323
when: minecraft_process_control == 'systemd'
2424

@@ -41,6 +41,6 @@
4141
state=started
4242
enabled=true
4343
with_items:
44-
- minecraft.service
45-
- minecraft.socket
44+
- "{{ minecraft_service_name }}.service"
45+
- "{{ minecraft_service_name }}.socket"
4646
when: minecraft_process_control == 'systemd'

tasks/setup/supervisor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
- name: configure Supervisor
1313
template:
1414
src=minecraft.conf.j2
15-
dest=/etc/supervisor/conf.d/minecraft.conf
15+
dest=/etc/supervisor/conf.d/{{ minecraft_service_name }}.conf
1616
owner=root
1717
group=root
1818
mode=0644

tasks/setup/systemd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- name: install units
66
template:
77
src={{ item }}.j2
8-
dest=/etc/systemd/system/{{ item }}
8+
dest=/etc/systemd/system/{{ item | replace('minecraft', minecraft_service_name) }}
99
owner=root
1010
group=root
1111
mode=0644
@@ -22,11 +22,11 @@
2222
- name: configure console directory
2323
template:
2424
src=tmpfiles.d/minecraft.conf.j2
25-
dest=/etc/tmpfiles.d/minecraft.conf
25+
dest=/etc/tmpfiles.d/{{ minecraft_service_name }}.conf
2626
owner=root
2727
group=root
2828
mode=0644
2929

3030
- name: create console directory
31-
command: systemd-tmpfiles --create /etc/tmpfiles.d/minecraft.conf
31+
command: systemd-tmpfiles --create /etc/tmpfiles.d/{{ minecraft_service_name }}.conf
3232
become: true

templates/minecraft.service.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
2-
Description=Minecraft Server
2+
Description={{ minecraft_service_name | title }} Server
33
After=network.target
4-
Requires=minecraft.socket
4+
Requires={{ minecraft_service_name }}.socket
55

66
# The server will sometimes crash after issuing `stop`. Thus we `save-all` and
77
# consider 143 a successful exit code. See: <https://bugs.mojang.com/browse/MC-38134>

templates/minecraft.socket.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Unit]
2-
Description=Minecraft Server Console
2+
Description={{ minecraft_service_name | title }} Server Console
33

44
[Socket]
55
ListenFIFO={{ minecraft_console_fifo }}

0 commit comments

Comments
 (0)