Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Merge remote-tracking branch 'processone/pr/3724'

Browse Source 
* processone/pr/3724:
  Remove CTLLOCKDIR (/var/lock/ejabberdctl) from Makefile.in
This commit is contained in:
Holger Weiss 2021-12-07 10:19:59 +01:00
commit 4a52042435
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.in
View File

@ -68,9 +68,6 @@ LUADIR = $(PRIVDIR)/lua
# /var/lib/ejabberd/ # /var/lib/ejabberd/
SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
# /var/lock/ejabberdctl
CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
# /var/log/ejabberd/ # /var/log/ejabberd/
LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
@ -313,11 +310,6 @@ install: copy-files
$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT) $(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
chmod -R 750 $(SPOOLDIR) chmod -R 750 $(SPOOLDIR)
# #
# ejabberdctl lock directory
$(INSTALL) -d -m 750 $(O_USER) $(CTLLOCKDIR)
$(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
chmod -R 750 $(CTLLOCKDIR)
#
# Log directory # Log directory
$(INSTALL) -d -m 750 $(O_USER) $(LOGDIR) $(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT) $(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
@ -366,7 +358,6 @@ uninstall-all: uninstall-binary
rm -rf $(ETCDIR) rm -rf $(ETCDIR)
rm -rf $(EJABBERDDIR) rm -rf $(EJABBERDDIR)
rm -rf $(SPOOLDIR) rm -rf $(SPOOLDIR)
rm -rf $(CTLLOCKDIR)
rm -rf $(LOGDIR) rm -rf $(LOGDIR)
clean: clean:

1
rebar.config
View File

@ -180,7 +180,6 @@
{overlay_vars, "vars.config"}, {overlay_vars, "vars.config"},
{extended_start_script, true}, {extended_start_script, true},
{overlay, [{mkdir, "var/log/ejabberd"}, {overlay, [{mkdir, "var/log/ejabberd"},
{mkdir, "var/lock"},
{mkdir, "var/lib/ejabberd"}, {mkdir, "var/lib/ejabberd"},
{mkdir, "etc/ejabberd"}, {mkdir, "etc/ejabberd"},
{copy, "rel/files/erl", "\{\{erts_vsn\}\}/bin/erl"}, % in rebar2 this prepends erts- {copy, "rel/files/erl", "\{\{erts_vsn\}\}/bin/erl"}, % in rebar2 this prepends erts-

1
rel/reltool.config.script
View File

@ -89,7 +89,6 @@ Sys = [{lib_dirs, []},
Overlay = [ Overlay = [
{mkdir, "var/log/ejabberd"}, {mkdir, "var/log/ejabberd"},
{mkdir, "var/lock"},
{mkdir, "var/lib/ejabberd"}, {mkdir, "var/lib/ejabberd"},
{mkdir, "etc/ejabberd"}, {mkdir, "etc/ejabberd"},
{mkdir, "doc"}, {mkdir, "doc"},