From 17fbc20c83360e9575135e734613c088da3e07dc Mon Sep 17 00:00:00 2001
From: BradChesney79 <bradchesney79@gmail.com>
Date: Thu, 5 Sep 2019 16:40:56 -0400
Subject: [PATCH] updated linux systemd service example and documentation

---
 contrib/systemd/gitea.service                 | 11 +++++-----
 .../run-as-service-in-ubuntu.en-us.md         | 21 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/contrib/systemd/gitea.service b/contrib/systemd/gitea.service
index d88df4a03719d..8a442bfb72dba 100644
--- a/contrib/systemd/gitea.service
+++ b/contrib/systemd/gitea.service
@@ -17,12 +17,11 @@ After=network.target
 #LimitNOFILE=65535
 RestartSec=2s
 Type=simple
-User=git
-Group=git
-WorkingDirectory=/var/lib/gitea/
-ExecStart=/usr/local/bin/gitea web -c /etc/gitea/app.ini
+User=root
+Group=root
+ExecStart=/usr/local/bin/gitea web
 Restart=always
-Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
+Environment=USER=root HOME=/root/gitea
 # If you want to bind Gitea to a port below 1024 uncomment
 # the two values below
 ###
@@ -30,4 +29,4 @@ Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
 #AmbientCapabilities=CAP_NET_BIND_SERVICE
 
 [Install]
-WantedBy=multi-user.target
+wantedBy=multi-user.target
diff --git a/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md b/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md
index d3b5df5b5afac..15e82abaa4d8f 100644
--- a/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md
+++ b/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md
@@ -13,7 +13,7 @@ menu:
     identifier: "linux-service"
 ---
 
-### Run as service in Ubuntu 16.04 LTS
+### Run as service in Debian (and derivative distros, i.e. Ubuntu 16.04 LTS)
 
 #### Using systemd
 
@@ -25,6 +25,7 @@ sudo vim /etc/systemd/system/gitea.service
 Copy the sample [gitea.service](https://github.com/go-gitea/gitea/blob/master/contrib/systemd/gitea.service).
 
 Uncomment any service that needs to be enabled on this host, such as MySQL.
+Also, the service file linked above uses /root/gitea, which you may need to create.
 
 Change the user, home directory, and other required startup values. Change the
 PORT or remove the -p flag if default port is used.
@@ -35,6 +36,24 @@ sudo systemctl enable gitea
 sudo systemctl start gitea
 ```
 
+You can customize the ExecStart line to use a different configuration file:
+```
+ExecStart=/usr/local/bin/gitea web -c /etc/gitea/app.ini
+```
+Edit the gitea.service file as needed to use a gitea configuration stored in a non-default location.
+
+Also configurable are the Working Directory and Environment lines in the \[Service\] section of the gitea.service file:
+
+```
+WorkingDirectory=/var/lib/gitea/
+```
+
+```
+Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
+```
+
+The above example lines are necessary for more customized and secure Gitea installations that do not run as the root user.
+Another reason to customize the gitea.service file is running multiple separate installations on one server.
 
 #### Using supervisor