From 4285ec6457e269e5f0f61e470657a1cb78b087f8 Mon Sep 17 00:00:00 2001 From: Jacopo De Simoi Date: Wed, 9 Nov 2022 14:27:02 -0500 Subject: [PATCH] Split install in two files - build.sh can be run as the user - install.sh should be run as root --- build.sh | 13 +++++++++++++ install.sh | 52 ++++++++++++++++++++-------------------------------- 2 files changed, 33 insertions(+), 32 deletions(-) create mode 100755 build.sh diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..a763a9c --- /dev/null +++ b/build.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -e + +( + cd cmd/peroxide + go build +) + +( + cd cmd/peroxide-cfg + go build +) diff --git a/install.sh b/install.sh index 4f92816..fc69c01 100755 --- a/install.sh +++ b/install.sh @@ -1,25 +1,13 @@ #!/bin/bash -set -e - -( - cd cmd/peroxide - go build -) - -( - cd cmd/peroxide-cfg - go build -) - -sudo cp cmd/peroxide/peroxide /usr/sbin -sudo cp cmd/peroxide-cfg/peroxide-cfg /usr/sbin +cp cmd/peroxide/peroxide /usr/sbin +cp cmd/peroxide-cfg/peroxide-cfg /usr/sbin set +e getent group peroxide >/dev/null 2>&1 if [ $? != 0 ]; then - sudo groupadd -r peroxide + groupadd -r peroxide fi GRP="" @@ -30,39 +18,39 @@ fi getent passwd peroxide >/dev/null 2>&1 if [ "$?" != "0" ]; then - sudo useradd --system --no-create-home -g peroxide $GRP peroxide + useradd --system --no-create-home -g peroxide $GRP peroxide fi set -e if [ ! -d /var/cache/peroxide ]; then - sudo mkdir /var/cache/peroxide - sudo chown peroxide:peroxide /var/cache/peroxide - sudo chmod 700 /var/cache/peroxide + mkdir /var/cache/peroxide + chown peroxide:peroxide /var/cache/peroxide + chmod 700 /var/cache/peroxide fi if [ ! -f /etc/peroxide.conf ]; then - sudo cp config.example.yaml /etc/peroxide.conf + cp config.example.yaml /etc/peroxide.conf fi if [ ! -d /etc/peroxide ]; then - sudo mkdir /etc/peroxide - sudo chown peroxide:peroxide /etc/peroxide - sudo chmod 700 /etc/peroxide + mkdir /etc/peroxide + chown peroxide:peroxide /etc/peroxide + chmod 700 /etc/peroxide fi -if [ ! -f /etc/systemd/system/peroxide.service ]; then - sudo cp peroxide.service /etc/systemd/system/peroxide.service - sudo systemctl daemon-reload -fi +#if [ ! -f /etc/systemd/system/peroxide.service ]; then +# cp peroxide.service /etc/systemd/system/peroxide.service +# systemctl daemon-reload +#fi if [ ! -d /var/log/peroxide ]; then - sudo mkdir /var/log/peroxide - sudo chown peroxide:peroxide /var/log/peroxide - sudo chmod 750 /var/log/peroxide + mkdir /var/log/peroxide + chown peroxide:peroxide /var/log/peroxide + chmod 750 /var/log/peroxide fi if [ -d /etc/logrotate.d ] && [ ! -f /etc/logrotate.d/peroxide ]; then - sudo cp peroxide.logrotate /etc/logrotate.d/peroxide - sudo systemctl restart logrotate + cp peroxide.logrotate /etc/logrotate.d/peroxide + # systemctl restart logrotate fi