mirror of
https://git.freebsd.org/ports.git
synced 2025-06-18 11:10:32 -04:00
250458d716
- Updated description of port - Added extra patches to change group - Bump port revision - Added gettext depend
44 lines
1.7 KiB
Text
44 lines
1.7 KiB
Text
--- extra/dist/tarantoolctl.orig 2015-07-07 14:38:20 UTC
|
|
+++ extra/dist/tarantoolctl
|
|
@@ -39,6 +39,7 @@ The file contains common default instanc
|
|
logger = "/var/log/tarantool",
|
|
|
|
username = "tarantool",
|
|
+ groupname = "tarantool",
|
|
}
|
|
|
|
instance_dir = "/etc/tarantool/instances.enabled"
|
|
@@ -259,7 +260,8 @@ function load_default_file(default_file)
|
|
|
|
if not usermode then
|
|
-- change user name only if not running locally
|
|
- d.username = d.username and d.username or "tarantool"
|
|
+ d.username = d.username and d.username or "tarantool"
|
|
+ d.groupname = d.groupname and d.groupname or "tarantool"
|
|
--
|
|
-- instance_dir must be set in the defaults file,
|
|
-- but don't try to set it to the global instance dir
|
|
@@ -310,9 +312,9 @@ local function mkdir(dirname)
|
|
os.exit(-1)
|
|
end
|
|
|
|
- if not usermode and not fio.chown(dirname, default_cfg.username, default_cfg.username) then
|
|
+ if not usermode and not fio.chown(dirname, default_cfg.username, default_cfg.groupname) then
|
|
log.error("Can't chown(%s, %s, %s): %s",
|
|
- default_cfg.username, default_cfg.username, dirname, errno.strerror())
|
|
+ default_cfg.username, default_cfg.groupname, dirname, errno.strerror())
|
|
end
|
|
end
|
|
|
|
@@ -367,8 +369,9 @@ local function wrapper_cfg(cfg)
|
|
--
|
|
-- force these startup options
|
|
--
|
|
- cfg.pid_file = default_cfg.pid_file
|
|
- cfg.username = default_cfg.username
|
|
+ cfg.pid_file = default_cfg.pid_file
|
|
+ cfg.username = default_cfg.username
|
|
+ cfg.groupname = default_cfg.groupname
|
|
if cfg.background == nil then
|
|
cfg.background = true
|
|
end
|