configurable listen options

diff --git a/gitlab-workhorse.init b/gitlab-workhorse.init
index 438e253f0277b80e9ae72e31835bdcad85eabd7a..d9e0826bfb40e474c24e1a6cf9c3d0a12aec188c 100755 (executable)
--- a/gitlab-workhorse.init
+++ b/gitlab-workhorse.init
@@ -49,10 +49,7 @@ start() {
        # http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-September/025111.html
        RC_LOGGING=no
        daemon --pidfile $pidfile --user $USER --makepid --chdir "$APP_PATH" --redirfds --fork \
-               /usr/sbin/gitlab-workhorse -listenUmask 0 \
-                       -authBackend http://localhost:8080 -authSocket /var/run/gitlab/gitlab.socket \
-                       -documentRoot /usr/lib/gitlab/public \
-                       -listenNetwork unix -listenAddr /var/run/gitlab/gitlab-workhorse.socket
+               /usr/sbin/gitlab-workhorse $OPTIONS $LISTEN_OPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch $lockfile
 }

diff --git a/gitlab-workhorse.service b/gitlab-workhorse.service
index f8fa4ac65e64641df800b7c22dc2bc2e8af2f63c..3c9ad9838f8b0540b21973b1ef14652d1ca7e11c 100644 (file)
--- a/gitlab-workhorse.service
+++ b/gitlab-workhorse.service
@@ -8,10 +8,8 @@ Type=simple
 User=git
 Group=git
 WorkingDirectory=/usr/lib/gitlab
-# listen on unix socket (nginx)
-ExecStart=/usr/sbin/gitlab-workhorse -listenUmask 0 -authBackend http://localhost:8080 -authSocket /var/run/gitlab/gitlab.socket -documentRoot /usr/lib/gitlab/public -listenNetwork unix -listenAddr /var/run/gitlab/gitlab-workhorse.socket
-# listen on tcp port (apache)
-#ExecStart=/usr/sbin/gitlab-workhorse -listenUmask 0 -authBackend http://localhost:8080 -authSocket /var/run/gitlab/gitlab.socket -documentRoot /usr/lib/gitlab/public -listenNetwork tcp  -listenAddr 0.0.0.0:8181
+EnvironmentFile=/etc/sysconfig/gitlab-workhorse
+ExecStart=/usr/sbin/gitlab-workhorse $OPTIONS $LISTEN_OPTIONS
 Restart=on-failure
 
 [Install]

diff --git a/gitlab-workhorse.spec b/gitlab-workhorse.spec
index dae10fcf822614f34c8145caa5be6913796ce195..2ca22de6440a3c58f27f0be7fe6f8eac3408d259 100644 (file)
--- a/gitlab-workhorse.spec
+++ b/gitlab-workhorse.spec
@@ -8,6 +8,7 @@ Source0:        https://gitlab.com/gitlab-org/gitlab-workhorse/repository/archive.tar.g
 # Source0-md5: 983d07b5c6f277dac7bc652d002f938b
 Source1:       %{name}.service
 Source2:       %{name}.init
+Source3:       %{name}.sysconfig
 URL:           https://gitlab.com/gitlab-org/gitlab-workhorse
 BuildRequires: git-core
 BuildRequires: golang >= 1.5
@@ -42,11 +43,12 @@ grep "$version" v
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{systemdunitdir},/etc/rc.d/init.d}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{systemdunitdir},/etc/{rc.d/init.d,sysconfig}}
 
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +71,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG README.md LICENSE
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/%{name}
 %{systemdunitdir}/%{name}.service

diff --git a/gitlab-workhorse.sysconfig b/gitlab-workhorse.sysconfig
new file mode 100644 (file)
index 0000000..f1b0928
--- /dev/null
+++ b/gitlab-workhorse.sysconfig
@@ -0,0 +1,11 @@
+# configuration for gitlab-workhorse
+
+OPTIONS="-listenUmask 0 -authBackend http://localhost:8080 -authSocket /var/run/gitlab/gitlab.socket -documentRoot /usr/lib/gitlab/public"
+
+# Unix socket for Nginx
+# listen on unix socket (nginx)
+LISTEN_OPTIONS="-listenNetwork unix -listenAddr /var/run/gitlab/gitlab-workhorse.socket"
+
+# listen on tcp port (apache)
+# TCP for Apache
+#LISTEN_OPTIONS="-listenNetwork tcp -listenAddr 0.0.0.0:8181"