diff options
| author | Dominik Lisiak <dominik.lisiak@bemsoft.pl> | 2019-03-19 14:23:33 +0100 |
|---|---|---|
| committer | Dominik Lisiak <dominik.lisiak@bemsoft.pl> | 2019-03-19 14:23:33 +0100 |
| commit | 7865d5168f961c4a2e62ed3564b7b95ba94d227e (patch) | |
| tree | 19fc9cb89b7caded9d32f22c81dd423512b92de6 | |
| parent | Removed GEOIP option, because no longer supported by FreeBSD (diff) | |
| download | ossec-7865d5168f961c4a2e62ed3564b7b95ba94d227e.tar.xz | |
Always detect user on demand, because package can be build and installed by different users.
| -rw-r--r-- | security/ossec-hids-local/Makefile | 3 | ||||
| -rw-r--r-- | security/ossec-hids-local/files/ossec-hids.in | 10 | ||||
| -rw-r--r-- | security/ossec-hids-local/files/pkg-install.in | 8 |
3 files changed, 14 insertions, 7 deletions
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile index 294475a..20e281e 100644 --- a/security/ossec-hids-local/Makefile +++ b/security/ossec-hids-local/Makefile @@ -2,7 +2,7 @@ PORTNAME= ossec-hids PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security PKGNAMESUFFIX= -${OSSEC_TYPE} @@ -159,7 +159,6 @@ SUB_LIST+= PORTNAME=${PORTNAME} \ VERSION=${PORTVERSION} \ DB_TYPE=${DB_TYPE} \ DB_SCHEMA=${DOCSDIR}/${DB_SCHEMA} \ - USER=${USER} \ OSSEC_USER=${OSSEC_USER} \ OSSEC_GROUP=${OSSEC_GROUP} \ OSSEC_RC=${OSSEC_RC} diff --git a/security/ossec-hids-local/files/ossec-hids.in b/security/ossec-hids-local/files/ossec-hids.in index 31ccfb4..f7449e7 100644 --- a/security/ossec-hids-local/files/ossec-hids.in +++ b/security/ossec-hids-local/files/ossec-hids.in @@ -34,6 +34,10 @@ load_rc_config $name ossec_type="%%OSSEC_TYPE%%" ossec_home="%%OSSEC_HOME%%" +if [ -z "${ossec_hids_user}" ]; then + ossec_hids_user=$(stat -f '%Su' "${ossec_home}") +fi + ossec_conf="${ossec_home}/etc/ossec.conf" ossec_conf_dir="${ossec_home}/etc/ossec.conf.d" ossec_conf_bin="${ossec_home}/bin/config/ossec-conf" @@ -353,7 +357,7 @@ ossec_hids_create_config() { if [ -x "${agent_conf_bin}" ]; then # Merge agent.conf.d files into agent.conf if [ "$1" == "force" ] || ossec_hids_config_is_outdated "${agent_conf}" "${agent_conf_dir}"; then - ossec_hids_create_file "${agent_conf}" %%USER%%:%%OSSEC_GROUP%% 0640 + ossec_hids_create_file "${agent_conf}" ${ossec_hids_user}:%%OSSEC_GROUP%% 0640 "${agent_conf_bin}" > "${agent_conf}" fi fi @@ -363,7 +367,7 @@ ossec_hids_create_config() { if [ -x "${ossec_conf_bin}" ]; then # Merge ossec.conf.d files into ossec.conf if [ "$1" == "force" ] || ossec_hids_config_is_outdated "${ossec_conf}" "${ossec_conf_dir}"; then - ossec_hids_create_file "${ossec_conf}" %%USER%%:%%OSSEC_GROUP%% 0640 + ossec_hids_create_file "${ossec_conf}" ${ossec_hids_user}:%%OSSEC_GROUP%% 0640 "${ossec_conf_bin}" > "${ossec_conf}" fi fi @@ -378,7 +382,7 @@ ossec_hids_create_env() { echo return 1 fi - install -o %%USER%% -g %%OSSEC_GROUP%% -m 0440 "${ossec_local_time}" "${ossec_home}${ossec_local_time}" + install -o ${ossec_hids_user} -g %%OSSEC_GROUP%% -m 0440 "${ossec_local_time}" "${ossec_home}${ossec_local_time}" return 0 } diff --git a/security/ossec-hids-local/files/pkg-install.in b/security/ossec-hids-local/files/pkg-install.in index d819e70..0181607 100644 --- a/security/ossec-hids-local/files/pkg-install.in +++ b/security/ossec-hids-local/files/pkg-install.in @@ -14,10 +14,14 @@ create_file() { } if [ "$2" == "POST-INSTALL" ]; then + if [ -z "${USER}" ]; then + USER=$(id -un) + fi + pw usermod %%OSSEC_USER%% -d "${ossec_home}" pw usermod ossecm -d "${ossec_home}" pw usermod ossecr -d "${ossec_home}" - chown %%USER%%:%%OSSEC_GROUP%% "${ossec_home}" + chown ${USER}:%%OSSEC_GROUP%% "${ossec_home}" - create_file "${client_keys}" root:ossec 0640 + create_file "${client_keys}" ${USER}:%%OSSEC_GROUP%% 0640 fi |