Skip to content

Commit

Permalink
Create xrdp subdirectory for pid and log
Browse files Browse the repository at this point in the history
  • Loading branch information
@metalefty
metalefty committed Feb 22, 2024
1 parent 2849dce commit 46180fc
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions common/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_LOG_PATH=\"${localstatedir}/log\"
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-DXRDP_LOG_PATH=\"${localstatedir}/log/xrdp\"

# -no-suppress is an automake-specific flag which is needed
# to prevent us missing compiler errors in some circumstances
Expand Down
1 change: 1 addition & 0 deletions instfiles/xrdp-sesman.service.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ BindsTo=xrdp.service
Type=exec
EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
EnvironmentFile=-@sysconfdir@/default/xrdp
RuntimeDirectory=xrdp
ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --nodaemon
ExecReload=kill -HUP $MAINPID

Expand Down
1 change: 1 addition & 0 deletions instfiles/xrdp.service.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ After=network.target xrdp-sesman.service
Type=exec
EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
EnvironmentFile=-@sysconfdir@/default/xrdp
RuntimeDirectory=xrdp
ExecStart=@sbindir@/xrdp $XRDP_OPTIONS --nodaemon
SystemCallArchitectures=native
SystemCallFilter=@basic-io @file-system @io-event @ipc @network-io @process
Expand Down
2 changes: 1 addition & 1 deletion keygen/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-I$(top_srcdir)/common

bin_PROGRAMS = \
Expand Down
2 changes: 1 addition & 1 deletion libxrdp/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-I$(top_srcdir)/common

AM_CFLAGS = $(OPENSSL_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion mc/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-I$(top_srcdir)/common

module_LTLIBRARIES = \
Expand Down
2 changes: 1 addition & 1 deletion neutrinordp/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-I$(top_srcdir)/common \
$(FREERDP_CFLAGS)

Expand Down
2 changes: 1 addition & 1 deletion sesman/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_LIBEXEC_PATH=\"${libexecdir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \
-I$(top_srcdir)/sesman/libsesman \
-I$(top_srcdir)/common \
Expand Down
2 changes: 1 addition & 1 deletion sesman/chansrv/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \
-I$(top_srcdir)/sesman/libsesman \
-I$(top_srcdir)/common
Expand Down
2 changes: 1 addition & 1 deletion vnc/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-I$(top_srcdir)/common

module_LTLIBRARIES = \
Expand Down
2 changes: 1 addition & 1 deletion xrdp/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_PID_PATH=\"${localstatedir}/run/xrdp\" \
-DXRDP_MODULE_PATH=\"${moduledir}\" \
-DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \
-I$(top_builddir) \
Expand Down

0 comments on commit 46180fc

Please sign in to comment.