Create systemd environment file

4 files changed, 31 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea819bbd5e76..6e05027c0422 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,12 @@ pkgbase = go-livepeer-bin
 	license = MIT
 	conflicts = go-livepeer-git
 	source = https://github.com/livepeer/go-livepeer/releases/download/v0.5.21/livepeer-linux-amd64.tar.gz
+	source = https://raw.githubusercontent.com/livepeer/go-livepeer/master/LICENSE
+	source = environment
 	source = livepeer.service
 	sha256sums = aa966e0af5599faf04d1c9334da36f59e3f6007ca23fc0f21c7c2379b998f0e4
-	sha256sums = 19f2c69e7f84e32236fe7f46a9b969cbe2f936651a1a50b818279fdd7299da3b
+	sha256sums = c4de4cf3034bc69b6832f22ea3e18957639e41f2ad7d4cfed6919f6e0dbf99ba
+	sha256sums = 90a56f615aac23a719ce7c7c09446e0bf712ad5598eb27699075d378eba8a2a9
+	sha256sums = 4cd1a524d4024d6edd5d1b0c6b1e7fc9f2183d7ccedab195a4203e6dd1c31670
 
 pkgname = go-livepeer-bin
diff --git a/PKGBUILD b/PKGBUILD
index cb0e671ba8e1..a127085a45aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,13 +10,18 @@ url='https://github.com/livepeer/go-livepeer'
 license=('MIT')
 conflicts=('go-livepeer-git')
 source=("https://github.com/livepeer/${_pkgname}/releases/download/v${pkgver}/livepeer-linux-amd64.tar.gz"
+  "https://raw.githubusercontent.com/livepeer/go-livepeer/master/LICENSE"
+  "environment"
   "livepeer.service")
 sha256sums=('aa966e0af5599faf04d1c9334da36f59e3f6007ca23fc0f21c7c2379b998f0e4'
-            '19f2c69e7f84e32236fe7f46a9b969cbe2f936651a1a50b818279fdd7299da3b')
+            'c4de4cf3034bc69b6832f22ea3e18957639e41f2ad7d4cfed6919f6e0dbf99ba'
+            '90a56f615aac23a719ce7c7c09446e0bf712ad5598eb27699075d378eba8a2a9'
+            '4cd1a524d4024d6edd5d1b0c6b1e7fc9f2183d7ccedab195a4203e6dd1c31670')
 package() {
-  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer" "$pkgdir/usr/bin/livepeer"
-  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer_bench" "$pkgdir/usr/bin/livepeer_bench"
-  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer_cli" "$pkgdir/usr/bin/livepeer_cli"
-  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer_router" "$pkgdir/usr/bin/livepeer_router"
-  install -Dm 644 "$srcdir/livepeer.service" -t "${pkgdir}/usr/lib/systemd/system"
+  install -Dm 644 "${srcdir}/environment" -t "${pkgdir}/etc/${_pkgname}"
+  install -Dm 644 "${srcdir}/livepeer.service" -t "${pkgdir}/usr/lib/systemd/system"
+  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer" "${pkgdir}/usr/bin/livepeer"
+  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer_cli" "${pkgdir}/usr/bin/livepeer_cli"
+  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer_bench" "${pkgdir}/usr/bin/livepeer_bench"
+  install -Dm 755 "${srcdir}/livepeer-linux-amd64/livepeer_router" "${pkgdir}/usr/bin/livepeer_router"
 }
diff --git a/environment b/environment
new file mode 100644
index 000000000000..f87d8a222705
--- /dev/null
+++ b/environment
@@ -0,0 +1,11 @@
+ethaddr=0x1a00000000000000000000000000000000000000
+ethurl=https://mainnet.infura.io/v3/00000000000011111111110000000000
+ethpass=mywalletpassword
+maxgas=40000000000
+unitprice=800
+serviceaddr=my.livepeer.node:8935
+sesh=6
+cliaddr=192.168.10.1:7935
+rew=false
+mon=false
+nvd=all
\ No newline at end of file
diff --git a/livepeer.service b/livepeer.service
index 3f2af23fe149..8653a6424cf9 100644
--- a/livepeer.service
+++ b/livepeer.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Start the Go-Livepeer service
+Description=Start the Go-Livepeer Orchestrator and Transcoder service
 After=network.target
 Wants=network-online.target
 # See https://www.cyberciti.biz/faq/linux-hide-processes-from-other-users/
@@ -7,26 +7,12 @@ Wants=network-online.target
 [Service]
 Restart=always
 Type=simple
+EnvironmentFile=/etc/go-livepeer/environment
 
 ExecStart=/usr/bin/livepeer -network mainnet -orchestrator -transcoder \
-	-maxSessions $sesh -cliAddr $cliadr -nvidia all -ethAcctAddr $ethaddr \
+	-maxSessions $sesh -cliAddr $cliaddr -nvidia $nvd -ethAcctAddr $ethaddr \
 	-ethPassword $ethpass -ethUrl $ethurl -pricePerUnit $unitprice \
 	-serviceAddr $serviceaddr -maxGasPrice $maxgas -reward=$rew -monitor=$mon
 
-
-# Update the ENV VARS below with your information
-# Then run: sudo systemctl daemon-reload && sudo systemctl enable --now
-
-Environment='ethaddr=0x1a00000000000000000000000000000000000000'
-Environment='ethurl=https://mainnet.infura.io/v3/00000000000011111111110000000000'
-Environment='unitprice=800'
-Environment='serviceaddr=my.livepeer.node:8935'
-Environment='ethpass=mywalletpassword'
-Environment='maxgas=40000000000'
-Environment='sesh=6'
-Environment='cliadr=10.10.10.1:7935'
-Environment='rew=false'
-Environment='mon=false'
-
 [Install]
-WantedBy=multi-user.target 
+WantedBy=multi-user.target
\ No newline at end of file