Adding user alotl

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

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

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

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: |
+    user: root
-      [Install]
+    group: root
-      WantedBy=multi-user.target
+    mode: 0644
-
-      [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

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: |
+    owner: root
-      [Install]
+    group: root
-      WantedBy=multi-user.target
+    mode: 0644
-
-      [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
 
 - name: Install start.sh
   copy:

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

roles/shell/tasks/users.yml

@@ -1,5 +1,5 @@
-
 ---
+
 - group:
     name: tilde
     state: present
@@ -8,136 +8,173 @@
     name: sudo
     state: present
     
-#Service accounts
+# Service accounts
-- include: users/minecraft.yml
 - include: users/bzflag.yml
-- include: users/znc.yml
 - include: users/cherry.yml
-#Normal Users
+- include: users/minecraft.yml
-- include: users/amcclure.yml
+- include: users/znc.yml
-- include: users/ben.yml
+
-- include: users/ubergeek.yml
+# Normal Users
-- 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/aavtt.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/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/init0.yml
+#- include: users/isaac.yml
+- include: users/jac98.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/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
+<<<<<<< HEAD
 - include: users/neo.yml
 #- include: users/init0.yml
 - include: users/lugubris.yml
@@ -173,3 +210,6 @@
 - include: users/noce.yml
 - include: users/cyber.yml
 - include: users/hamlet.yml
+=======
+>>>>>>> fdde9674f127110abfa25bcf15d8c92a1961e4be
+- include: users/alotl.yml

roles/shell/tasks/users/alotl.yml

@@ -0,0 +1,15 @@
+---
+- name: Setting up alotl
+  user:
+    name: alotl
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/alotl
+- authorized_key:
+    user: alotl
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxR5x7ccQwiWyy7e6mo+vxxmebFlZjoMX4GMeophT5RbIuBGJL9zeZy4cNDHYkF9COq8VGtPWLUmQjEzyHEOdVcibOo8zZfihsR252H8fdjjqxTqmYRg4Wa548S1mboXKUO8qPQTeYJ12Rz2Ql3qG4yPDhMxikeuN1WDuAddAyDem3qiv/IT/PrtBbnFdT60/a2vH/rA1lbfsfpJ+T1RaYpDnqo8mqhQFty9hhUzDSmALaF8OGEqh3rc9to0iQGPxGmN8JH6gmtKbkHzaacDpjut4uw//qUz/JbGOhk4rQ3B2Y2enuEuTf1FzqgsNSRCEq/kcIATIQjv5BboAhKEPZ"

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