From 53dbea8be7540a8d1c90b0aa870717fa5c42988e Mon Sep 17 00:00:00 2001
From: guest <ubuntu@ubu2.cherished.me>
Date: Sat, 8 Oct 2022 08:22:03 +0000
Subject: [PATCH] more

---
 Taskfile.yml | 25 ++++++++++++++++++-------
 task.sh      |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index 7421532..d5ca0ba 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -5,8 +5,10 @@ tasks:
   default:
     cmds:
       - if command -v task; then task -l else go-task -l; fi
+    silent: true
 
   install:
+    desc: Install software
     cmds:
       - mkdir ~/.local/bin
       - mv go-task/task ~/.local/bin
@@ -17,8 +19,23 @@ tasks:
       - sudo cp docker/docker-ce.repo /etc/yum.repos.d
       - sudo rpm-ostree install docker-compose-plugin
 
+  folders:
+    desc: Make folders for server
+    cmds:
+      - sudo mkdir -p /srv/{config,backup,gotask,rpdata,secret,srvtls,server}
+      - sudo chmod 700 /srv/{config,backup,gotask,rpdata,secret,srvtls,server}
+      - sudo chown 1000 /srv/{config,backup,gotask,rpdata,secret,srvtls,server}
+      - cp -r . /srv/server
+      - cd /srv/server
+
+  status:
+    desc: Server Status
+    cmds:
+      - sudo -v
+      - task: f2bs
+      - task: ztrs
+
   f2bs:
-    desc: Status of fail2ban bans
     cmds:
       - sudo fail2ban-client get sshd banip --with-time
       - sudo fail2ban-client get bad-auth banip --with-time
@@ -27,7 +44,6 @@ tasks:
       - test 'command -v fail2ban-client'
 
   ztrs:
-    desc: Status of zerotier network
     cmds:
       - sudo zerotier-cli status
       - sudo zerotier-cli listnetworks
@@ -57,8 +73,3 @@ tasks:
     preconditions:
       - test 'commmand -v fail2ban-server'
 
-
-  ztrj:
-    desc: Join Zerotier happy_hurleys network
-    cmds:
-      - sudo zerotier-cli join 35c192ce9bcc3c6e
diff --git a/task.sh b/task.sh
index f90bf0b..cbea86b 100755
--- a/task.sh
+++ b/task.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./go-task/task 
+./go-task/task "$@"