diff options
Diffstat (limited to 'www/gitlab-pages/files')
| -rw-r--r-- | www/gitlab-pages/files/gitlab_pages.in | 20 | ||||
| -rw-r--r-- | www/gitlab-pages/files/patch-gitlab-pages.conf.sample | 9 |
2 files changed, 12 insertions, 17 deletions
diff --git a/www/gitlab-pages/files/gitlab_pages.in b/www/gitlab-pages/files/gitlab_pages.in index 99a19a3bad2c..f49fd4b4e6f6 100644 --- a/www/gitlab-pages/files/gitlab_pages.in +++ b/www/gitlab-pages/files/gitlab_pages.in @@ -31,6 +31,7 @@ load_rc_config $name : ${gitlab_pages_user:="gitlab-pages"} : ${gitlab_pages_group:="gitlab-pages"} : ${gitlab_pages_logfile:="/var/log/gitlab_pages.log"} +: ${gitlab_pages_args:="-config=%%PREFIX%%/share/gitlab-pages/gitlab-pages.conf"} export HOME=${gitlab_pages_dir} export PATH=${PATH}:%%PREFIX%%/bin @@ -38,24 +39,10 @@ export PATH=${PATH}:%%PREFIX%%/bin pidfile="/var/run/${name}.pid" gitlab_pages_chdir="${gitlab_pages_dir}" -procname=%%PREFIX%%/bin/gitlab-pages +procname=%%PREFIX%%/share/gitlab-pages/bin/gitlab-pages start_precmd="gitlab_pages_startprecmd" start_cmd="gitlab_pages_startcmd" -list_cmd="listfunc" -register_cmd="registerfunc" - -listfunc() -{ - cd ${gitlab_pages_chdir} ; \ - su -m ${gitlab_pages_user} -c "env HOME=${gitlab_pages_dir} %%PREFIX%%/bin/gitlab-pages list" -} - -registerfunc() -{ - cd ${gitlab_pages_chdir} ; \ - su -m ${gitlab_pages_user} -c "env HOME=${gitlab_pages_dir} %%PREFIX%%/bin/gitlab-pages register" -} gitlab_pages_startprecmd() { @@ -70,8 +57,7 @@ gitlab_pages_startprecmd() gitlab_pages_startcmd() { cd ${gitlab_pages_chdir} ; \ - daemon -u ${gitlab_pages_user} -p ${pidfile} /usr/local/bin/gitlab-pages ${gitlab_pages_args} run < /dev/null >> ${gitlab_pages_logfile} 2>> ${gitlab_pages_logfile} + daemon -u ${gitlab_pages_user} -p ${pidfile} ${procname} ${gitlab_pages_args} run < /dev/null >> ${gitlab_pages_logfile} 2>> ${gitlab_pages_logfile} } -extra_commands="list register" run_rc_command $1 diff --git a/www/gitlab-pages/files/patch-gitlab-pages.conf.sample b/www/gitlab-pages/files/patch-gitlab-pages.conf.sample new file mode 100644 index 000000000000..d73eae49370e --- /dev/null +++ b/www/gitlab-pages/files/patch-gitlab-pages.conf.sample @@ -0,0 +1,9 @@ +--- gitlab-pages.conf.sample.orig 2023-05-30 05:09:18 UTC ++++ gitlab-pages.conf.sample +@@ -0,0 +1,6 @@ ++listen-http=:8090 ++pages-root=%%PREFIX%%/www/gitlab-ce/shared/pages ++api-secret-key=%%PREFIX%%/www/gitlab-ce/.gitlab_pages_secret ++pages-domain=pages.example.com ++internal-gitlab-server=https://gitlab.example.com ++ |