From fdde9674f127110abfa25bcf15d8c92a1961e4be Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 20 Jan 2020 12:11:44 +1100 Subject: [PATCH] refractor shell role --- roles/shell/files/bzflag.service | 14 ++ roles/shell/files/minecraft.service | 14 ++ roles/shell/tasks/apache2-mods.yml | 9 +- roles/shell/tasks/bzflag.yml | 19 +- roles/shell/tasks/minecraft.yml | 19 +- roles/shell/tasks/pb.yml | 2 +- roles/shell/tasks/users.yml | 315 ++++++++++++++-------------- roles/shell/tasks/vnc.yml | 2 +- 8 files changed, 202 insertions(+), 192 deletions(-) create mode 100644 roles/shell/files/bzflag.service create mode 100644 roles/shell/files/minecraft.service diff --git a/roles/shell/files/bzflag.service b/roles/shell/files/bzflag.service new file mode 100644 index 00000000..0642324b --- /dev/null +++ b/roles/shell/files/bzflag.service @@ -0,0 +1,14 @@ +[Install] +WantedBy=multi-user.target + +[Unit] +Description=BZFlag Game Server +After=network-online.target + +[Service] +ExecStart=/usr/games/bzfs -conf /var/lib/bzflag/bzflag.conf +ExecReload=/bin/kill -HUP $MAINPID +User=bzflag + +[Install] +WantedBy=multi-user.target diff --git a/roles/shell/files/minecraft.service b/roles/shell/files/minecraft.service new file mode 100644 index 00000000..c78c9743 --- /dev/null +++ b/roles/shell/files/minecraft.service @@ -0,0 +1,14 @@ +[Install] +WantedBy=multi-user.target + +[Unit] +Description=Minecraft Game Server +After=network-online.target + +[Service] +ExecStart=/var/lib/minecraft/paper/start.sh +ExecReload=/bin/kill -HUP $MAINPID +User=minecraft + +[Install] +WantedBy=multi-user.target diff --git a/roles/shell/tasks/apache2-mods.yml b/roles/shell/tasks/apache2-mods.yml index c9955871..ea381ff4 100644 --- a/roles/shell/tasks/apache2-mods.yml +++ b/roles/shell/tasks/apache2-mods.yml @@ -1,14 +1,17 @@ # Enable or disable apache2 mods --- -- name: userdir + +- name: Enable userdir apache module apache2_module: name: userdir state: present -- name: ssl + +- name: Enable ssl apache module apache2_module: name: ssl state: present -- name: php7.0 + +- name: Enable php7.0 apache module apache2_module: name: php7.0 state: present diff --git a/roles/shell/tasks/bzflag.yml b/roles/shell/tasks/bzflag.yml index 29d9e49b..7fa6ce1f 100644 --- a/roles/shell/tasks/bzflag.yml +++ b/roles/shell/tasks/bzflag.yml @@ -11,19 +11,8 @@ - name: Install bzflag target copy: + src: ../files/bzflag.service dest: /etc/systemd/system/bzflag.service - content: | - [Install] - WantedBy=multi-user.target - - [Unit] - Description=BZFlag Game Server - After=network-online.target - - [Service] - ExecStart=/usr/games/bzfs -conf /var/lib/bzflag/bzflag.conf - ExecReload=/bin/kill -HUP $MAINPID - User=bzflag - - [Install] - WantedBy=multi-user.target + user: root + group: root + mode: 0644 diff --git a/roles/shell/tasks/minecraft.yml b/roles/shell/tasks/minecraft.yml index c02233d8..a7e2ec1d 100644 --- a/roles/shell/tasks/minecraft.yml +++ b/roles/shell/tasks/minecraft.yml @@ -10,22 +10,11 @@ - name: Install minecraft target copy: + src: ../files/minecraft.service dest: /etc/systemd/system/minecraft.service - content: | - [Install] - WantedBy=multi-user.target - - [Unit] - Description=Minecraft Game Server - After=network-online.target - - [Service] - ExecStart=/var/lib/minecraft/paper/start.sh - ExecReload=/bin/kill -HUP $MAINPID - User=minecraft - - [Install] - WantedBy=multi-user.target + owner: root + group: root + mode: 0644 - name: Install start.sh copy: diff --git a/roles/shell/tasks/pb.yml b/roles/shell/tasks/pb.yml index 6758af8f..635a5fc9 100644 --- a/roles/shell/tasks/pb.yml +++ b/roles/shell/tasks/pb.yml @@ -1,6 +1,6 @@ # install pb --- -- name: clone pb +- name: Clone pb git: repo: https://tildegit.org/tomasino/pb dest: /usr/src/pb diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index c4f57ddd..dc971526 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -1,5 +1,5 @@ - --- + - group: name: tilde state: present @@ -8,168 +8,169 @@ name: sudo state: present -#Service accounts -- include: users/minecraft.yml +# Service accounts - include: users/bzflag.yml -- include: users/znc.yml - include: users/cherry.yml -#Normal Users -- include: users/amcclure.yml -- include: users/ben.yml -- include: users/ubergeek.yml -- include: users/naglfar.yml -- include: users/anton.yml -- include: users/fosslinux.yml -- include: users/slip.yml -#- include: users/parik.yml -- include: users/quetzalcoatl.yml -- include: users/redhat.yml -- include: users/gokce.yml -- include: users/r.yml -#- include: users/brendantcc.yml -#- include: users/dragon.yml -#- include: users/spanmer.yml -#- include: users/panzer.yml -- include: users/hawaii.yml -- include: users/trip.yml -#- include: users/xenialito69.yml -#- include: users/freuddy.yml -#- include: users/ringo.yml -#- include: users/hexhaxtron.yml -#- include: users/smtpsupplicant.yml -- include: users/orliesaurus.yml -- include: users/gooly.yml -- include: users/diabla.yml -- include: users/ml.yml -- include: users/usernameak.yml -- include: users/user.yml -- include: users/angelok.yml -#- include: users/johnc.yml -#- include: users/k4j.yml -#- include: users/ultima.yml -#- include: users/ragnarok.yml -#- include: users/jundi.yml -#- include: users/rado.yml -#- include: users/sata.yml -- include: users/wesx.yml -- include: users/arda.yml -#- include: users/larasaty.yml -- include: users/bercik.yml -- include: users/khuxkm.yml -#- include: users/z00t.yml -- include: users/swann.yml -#- include: users/ukhuwah.yml -#- include: users/mom.yml -#- include: users/andro.yml -#- include: users/hasbullah.yml -#- include: users/riska.yml -#- include: users/naruto.yml -#- include: users/pria.yml -#- include: users/abimks.yml -#- include: users/bullah.yml -- include: users/dalist.yml -- include: users/apple.yml -#- include: users/logique.yml -#- include: users/jumbajookiba.yml -#- include: users/letamesis.yml -- include: users/chuck.yml -#- include: users/janda.yml -#- include: users/os.yml -#- include: users/akoeabi.yml -#- include: users/mks.yml -#- include: users/makmur.yml -#- include: users/makassar.yml -#- include: users/abah.yml -#- include: users/derby.yml -- include: users/usher.yml -#- include: users/responsibleracoon.yml -- include: users/transfusion.yml -- include: users/adam.yml -#- include: users/audiofile.yml -#- include: users/vgk.yml -- include: users/cyphyx.yml -#- include: users/krystianbajno.yml -- include: users/vigilant.yml -#- include: users/isaac.yml -- include: users/moskrin.yml -- include: users/southerntofu.yml -- include: users/dariusz.yml -#- include: users/aniruddh.yml -- include: users/growl.yml -- include: users/rain.yml -#- include: users/mspe.yml -#- include: users/pidgeotto.yml -- include: users/wie.yml -#- include: users/tomjerr.yml -- include: users/yximdoa.yml -- include: users/dovahkin.yml -#- include: users/philip.yml -#- include: users/sancho.yml -- include: users/thekingofbandit.yml -#- include: users/golden.yml -- include: users/marc.yml -#- include: users/stenli990801.yml -#- include: users/lytedev.yml -#- include: users/skirk.yml -- include: users/serafeim.yml -#- include: users/dot.yml -#- include: users/virus.yml -#- include: users/mandelbroth.yml -- include: users/victoralt.yml -#- include: users/arch3r.yml -- include: users/linel.yml -- include: users/haivets.yml -#- include: users/tux.yml -- include: users/georges.yml -- include: users/techemporium.yml -#- include: users/un4ckn0wl3z.yml -#- include: users/aewens.yml -- include: users/dex.yml -- include: users/vernon.yml -#- include: users/xallmm.yml -#- include: users/danielscode.yml -- include: users/haakondahl.yml -#- include: users/warcall22.yml -#- include: users/fncso.yml -#- include: users/fncdo.yml -- include: users/pavel.yml -- include: users/quantum.yml -#- include: users/gonthey.yml -- include: users/mononote.yml +- include: users/minecraft.yml +- include: users/znc.yml + +# Normal Users - include: users/aavtt.yml -- include: users/zszoke.yml -- include: users/neo.yml -#- include: users/init0.yml -- include: users/lugubris.yml -#- include: users/syncore.yml -- include: users/geetfun.yml -#- include: users/jin264.yml -#- include: users/camellia.yml -- include: users/liesinties.yml -#- include: users/hijaben.yml -#- include: users/delta.yml -- include: users/neil.yml -- include: users/hitomi.yml -- include: users/sakhawkins.yml +#- include: users/abah.yml +#- include: users/abimks.yml +- include: users/adam.yml +#- include: users/aewens.yml +#- include: users/akoeabi.yml +- include: users/amcclure.yml +#- include: users/andro.yml +- include: users/angelok.yml +#- include: users/aniruddh.yml +- include: users/anton.yml +- include: users/apple.yml +#- include: users/arch3r.yml +- include: users/arda.yml - include: users/atdx.yml +#- include: users/audiofile.yml +- include: users/bacterio.yml +- include: users/ben.yml +- include: users/bercik.yml +#- include: users/brendantcc.yml +#- include: users/bullah.yml +#- include: users/camellia.yml +- include: users/chispitos.yml +- include: users/chuck.yml +- include: users/clu.yml +- include: users/cyber.yml +- include: users/cyphyx.yml +- include: users/d34d.yml +- include: users/dalist.yml +#- include: users/danielscode.yml +- include: users/dariusz.yml +#- include: users/delta.yml +#- include: users/derby.yml +- include: users/dex.yml +- include: users/diabla.yml - include: users/dingb4t.yml -- include: users/kronos.yml -#- include: users/leonid.yml -- include: users/shark.yml -- include: users/stereo.yml -- include: users/joro.yml +#- include: users/dot.yml +- include: users/dovahkin.yml +#- include: users/dragon.yml +#- include: users/fncdo.yml +#- include: users/fncso.yml +- include: users/fosslinux.yml +#- include: users/freuddy.yml +- include: users/geetfun.yml +- include: users/georges.yml +- include: users/gokce.yml +#- include: users/golden.yml +#- include: users/gonthey.yml +- include: users/gooly.yml +- include: users/growl.yml +- include: users/haakondahl.yml +- include: users/haivets.yml +- include: users/hamlet.yml +#- include: users/hasbullah.yml +- include: users/hawaii.yml +#- include: users/hexhaxtron.yml +#- include: users/hijaben.yml +- include: users/hitomi.yml - include: users/info.yml - include: users/infoTV.yml -- include: users/clu.yml -- include: users/sebre.yml -- include: users/olya.yml -- include: users/kpeh.yml -- include: users/saturnv.yml -- include: users/chispitos.yml -- include: users/bacterio.yml +#- include: users/init0.yml +#- include: users/isaac.yml - include: users/jac98.yml -- include: users/turboblack.yml -- include: users/d34d.yml +#- include: users/janda.yml +#- include: users/jin264.yml +#- include: users/johnc.yml +- include: users/joro.yml +#- include: users/jumbajookiba.yml +#- include: users/jundi.yml +#- include: users/k4j.yml +- include: users/khuxkm.yml +- include: users/kpeh.yml +- include: users/kronos.yml +#- include: users/krystianbajno.yml +#- include: users/larasaty.yml +#- include: users/leonid.yml +#- include: users/letamesis.yml +- include: users/liesinties.yml +- include: users/linel.yml +#- include: users/logique.yml +- include: users/lugubris.yml +#- include: users/lytedev.yml +#- include: users/makassar.yml +#- include: users/makmur.yml +#- include: users/mandelbroth.yml +- include: users/marc.yml +#- include: users/mks.yml +- include: users/ml.yml +#- include: users/mom.yml +- include: users/mononote.yml +- include: users/moskrin.yml +#- include: users/mspe.yml +- include: users/naglfar.yml +#- include: users/naruto.yml +- include: users/neil.yml +- include: users/neo.yml - include: users/noce.yml -- include: users/cyber.yml -- include: users/hamlet.yml +- include: users/olya.yml +- include: users/orliesaurus.yml +#- include: users/os.yml +#- include: users/panzer.yml +#- include: users/parik.yml +- include: users/pavel.yml +#- include: users/philip.yml +#- include: users/pidgeotto.yml +#- include: users/pria.yml +- include: users/quantum.yml +- include: users/quetzalcoatl.yml +- include: users/r.yml +#- include: users/rado.yml +#- include: users/ragnarok.yml +- include: users/rain.yml +- include: users/redhat.yml +#- include: users/responsibleracoon.yml +#- include: users/ringo.yml +#- include: users/riska.yml +- include: users/sakhawkins.yml +#- include: users/sancho.yml +#- include: users/sata.yml +- include: users/saturnv.yml +- include: users/sebre.yml +- include: users/serafeim.yml +- include: users/shark.yml +#- include: users/skirk.yml +- include: users/slip.yml +#- include: users/smtpsupplicant.yml +- include: users/southerntofu.yml +#- include: users/spanmer.yml +#- include: users/stenli990801.yml +- include: users/stereo.yml +- include: users/swann.yml +#- include: users/syncore.yml +- include: users/techemporium.yml +- include: users/thekingofbandit.yml +#- include: users/tomjerr.yml +- include: users/transfusion.yml +- include: users/trip.yml +- include: users/turboblack.yml +#- include: users/tux.yml +- include: users/ubergeek.yml +#- include: users/ukhuwah.yml +#- include: users/ultima.yml +#- include: users/un4ckn0wl3z.yml +- include: users/user.yml +- include: users/usernameak.yml +- include: users/usher.yml +- include: users/vernon.yml +#- include: users/vgk.yml +- include: users/victoralt.yml +- include: users/vigilant.yml +#- include: users/virus.yml +#- include: users/warcall22.yml +- include: users/wesx.yml +- include: users/wie.yml +#- include: users/xallmm.yml +#- include: users/xenialito69.yml +- include: users/yximdoa.yml +#- include: users/z00t.yml +- include: users/zszoke.yml diff --git a/roles/shell/tasks/vnc.yml b/roles/shell/tasks/vnc.yml index 9a622973..2a267535 100644 --- a/roles/shell/tasks/vnc.yml +++ b/roles/shell/tasks/vnc.yml @@ -1,6 +1,6 @@ # install vnc scripts --- -- name: clone vnc +- name: Clone vnc git: repo: https://tildegit.org/thunix/vnc dest: /usr/src/vnc