Commit Graph

137 Commits

Author SHA1 Message Date
Pavel Roskin b63575cebc Create and install rsakeys.ini
Use install-data-hook to ensure restrictive permissions on rsakeys.ini.

Don't create rsakeys.ini in init scripts. This makes xrdp functional upon
"make install" without relying on the init scripts.

Packagers should not package rsakeys.ini, it should be created when the
package is installed.
2016-02-23 22:33:28 -08:00
Pavel Roskin 22e6f3e2f7 Use SCRIPTS for executable scripts, don't use "chmod 755" 2016-02-22 23:13:16 -08:00
Pavel Roskin 7642675ddf Use "dist_" prefix to minimize use of EXTRA_DIST
"dist" is ignored in presense of "noinst", so keep noinst_man_MANS.
2016-02-22 22:11:57 -08:00
Pavel Roskin afa6ec97cc Install the most appropriate PAM settings file
Installing a file referring to common-auth is of no use if that file
doesn't exit.

Don't use "password" entry, xrdp doesn't ever change user password.
2016-02-13 18:44:28 -08:00
Pavel Roskin 9a1dea8e50 Fix sloppy formatting in instfiles/Makefile.am
Use spaces around = and +=, indent by 2 spaces.
2016-02-12 23:52:45 -08:00
Itamar Reis Peixoto 94ca3516b1 Merge pull request #310 from noldor/devel
update japanese keyboard "Henkan_Mode" key and "Muhenkan" key
2016-02-08 22:45:22 -02:00
Pavel Roskin 02c981e796 More spelling fixes found by codespell and aspell 2016-01-30 17:39:25 -08:00
noldor 1fb706c0fc update japanese keyboard "Henkan_Mode" key and "Muhenkan" key 2016-01-30 21:35:20 +09:00
Pavel Roskin dac8bf728a PIDDIR should be /var/run, not /var/run/xrdp
There are no references to /var/run/xrdp anywhere else in the code.
2016-01-14 16:32:09 +00:00
Itamar Reis Peixoto 9f710ce94a Merge pull request #276 from metalefty/show-license-freebsd-rc
instfiles: show license at the script taken from FreeBSD ports
2015-11-18 11:39:50 -02:00
Koichiro IWAO 7136fe608f instfiles: add km-100c.ini to Makefile.am
Closes neutrinolabs/xrdp#280.
2015-11-11 11:01:00 +09:00
Dartheo 7cd97bd2af add swiss french keyboard map 2015-11-11 10:56:06 +09:00
Itamar Reis Peixoto 5f16481feb Merge pull request #267 from moobyfr/fix-systemd-debian
some fixes for systemd on debian
2015-10-14 08:40:53 -04:00
Itamar Reis Peixoto 04f8982f5e add missing .ini files into extra_dist, so they will appear in xrdp tarball after a make dist 2015-08-30 19:03:12 -03:00
Koichiro IWAO 8f4b59ac73 instfiles: show license at the script taken from FreeBSD ports 2015-08-21 14:16:20 +09:00
Blindauer Emmanuel 4179589548 Add default directory for debian, and set them optional
Remove the --nodaemon which makes the service fail at start
2015-07-24 08:49:12 +02:00
Itamar Reis Peixoto 26780d7fea improve systemd unit files 2015-07-15 14:23:39 -03:00
itamarjp c5cac75593 add more missing files into extra_dist 2015-07-14 12:16:25 -03:00
Koichiro IWAO 0f8f03e9cf instfiles: merge rc script from FreeBSD
- merge rc script from FreeBSD
- modify Makefile.am to detect OS and install suitable files
2015-06-18 16:25:39 +09:00
speidy 8904252a98 instfiles: Add line seperator to makefile 2015-05-02 11:51:38 +03:00
jsorg71 830a93d824 Merge pull request #235 from metalefty/init-scripts-on-systemd
instfiles: init.d/xrdp shouldn't be installed on systemd system
2015-05-01 17:45:06 -07:00
Koichiro IWAO 2ce05038fd instfiles: default/xrdp is not needed as well on systemd 2015-04-27 09:28:27 +09:00
Thomas Spalinger 04b729ccd1 finish for supporting swiss german keyboard 2015-04-19 16:33:26 -07:00
Koichiro IWAO ea0aba4ae3 instfiles: init.d/xrdp shouldn't be installed on systemd system
On systemd system, at least CentOS 7, `service foo start` command
works as wrapper of `systemctl start foo`.  However, xrdp installs
init script into /etc/init.d/xrdp.  This script is not necessary
for systemd system, and, what is worse,  if init.d/xrdp exists,
`service xrdp start` works as wrapper to run init.d/xrdp. Maybe
this is inconvinient for many users.
2015-04-17 10:07:42 +09:00
Jay Sorg ee8998483b Merge branch 'devel' 2015-01-07 20:44:16 -08:00
Jay Sorg 1052841cc6 Merge branch 'add-japanese-keymap' of git://github.com/metalefty/xrdp into metalefty-add-japanese-keymap
Conflicts:
	xrdp/xrdp_keyboard.ini
2014-12-12 23:45:41 -08:00
Jay Sorg 3989dfcecc pulseaudio: if source and sink are not installed, use null sink so pulseaudio will always start 2014-12-11 14:56:52 -08:00
Koichiro IWAO 67570b45de Add Japanese keymap 2014-12-01 16:32:18 +09:00
Jay Sorg 32f172853f Merge branch 'devel' 2014-11-13 22:08:14 -08:00
jsorg71 ddfd6b8b59 Merge pull request #144 from seabres/pambranch
Change to allow authentication against all authentication methods.
2014-11-08 21:26:21 -08:00
Michał Górny cc3231272d Install and enable 0415/pl keymap 2014-10-27 12:53:19 +01:00
Michał Górny 9656fa8666 Update keymaps 2014-10-27 12:51:49 +01:00
seabres aa4783e933 Change to allow authentication against all authentication methods. 2014-06-04 18:21:55 +02:00
Jay Sorg 2abe16a609 pulse always sink 2014-05-26 14:34:38 -07:00
Jay Sorg 1d1eb037f3 added defautl.pa 2014-05-20 00:50:41 -07:00
Jay Sorg 434372dbe4 added default.pa 2014-05-20 00:19:28 -07:00
Congyi Wu 171aa36a51 Fix absolute path in instfiles/Makefile.am 2013-10-23 00:43:54 -04:00
cocoon 781e992c9e xrdp initscript add BASE var, add SDAEMON var, replace fullpaths
with combined path var

-DAEMON=/usr/sbin/xrdp

+BASE=__BASE__
(PREFIX gets replaced by given prefix, or as fallback /usr/local on Ubuntu)

+DAEMON=${BASE}/sbin/xrdp
+SDAEMON=${BASE}/sbin/xrdp-sesman
2013-07-05 21:58:16 +02:00
cocoon ec7d1b4c38 dynamically insert prefix path into init script
using sed -i when running make install
2013-07-05 21:55:14 +02:00
Jay Sorg e1d14daeac add norwegian keyboard definition 2013-05-25 15:26:43 -07:00
Jay Sorg 8449ac4b55 pam: added xrdp-sesman.other 2013-05-07 21:58:00 -07:00
Jay Sorg d4f72c52ae pam changes to use system default 2013-04-22 10:56:20 -07:00
Gustavo Homem 4abac0a05d remove awkward rsakeys.init comparison 2013-03-21 18:22:21 +00:00
Gustavo Homem 3543206ad7 correct usage 2013-03-20 18:28:17 +00:00
Gustavo Homem 68f38adaa3 more robust version, including force-stop option 2013-03-20 18:22:53 +00:00
Gustavo Homem 49301fac00 further integration fixes 2013-03-20 17:19:40 +00:00
Gustavo Homem 276675a235 add FORCE flag to ensure the service really stops (overridable by system
administraor)
2013-03-20 16:29:58 +00:00
Gustavo Homem ec0f41df3c fix xrdp init script permissions 2013-03-20 11:57:16 +00:00
Gustavo Homem 4c24a5605d Changes related to integration 2013-03-18 22:06:10 +00:00
Jay Sorg 3cedfae76a added LSB tags to xrdp.sh 2012-09-07 22:47:27 -07:00
Itamar Reis Peixoto a3d63eb5e0 add systemd support into xrdp 2012-05-26 14:15:45 -03:00
Itamar Reis Peixoto 89eb5d03c7 Keymap for Brazilian ABNT2 keyboard 2011-05-06 21:25:45 -03:00
Nicola Ruggero 3f670bab6b Added SwissGerman keyboard layout file. Thx to Manuel Salera 2011-01-17 09:24:39 +01:00
Nicola Ruggero cad33d7f34 New key layout (Dutch Belgium 0x0813 and French Belgium 0x080c)
Thanks Seppe De Loore
2010-12-15 08:57:36 +01:00
Itamar Reis Peixoto 350c3c2488 include more files missed in make dist 2010-11-20 22:13:50 -02:00
Itamar Reis Peixoto ee43109a87 add xrdp-sesman pam.d file into tarball when doing a make dist 2010-11-20 22:13:49 -02:00
jsorg71 768222424e added km-040c.ini 2009-10-11 00:36:38 +00:00
jsorg71 90bf3cd911 update keymaps 2009-10-09 08:03:15 +00:00
jsorg71 60e282de05 added pam_env.so to pam xrdp-sesman 2009-09-20 19:06:14 +00:00
jsorg71 320ebe88e9 keymap changes 2009-08-12 02:19:00 +00:00
jsorg71 85ae1cd27e keymap changes 2009-08-12 01:53:34 +00:00
jsorg71 a34ca6793a remove /etc/init.d changes and auto keygen 2009-08-08 01:35:28 +00:00
jsorg71 f1ebdf189e added post install hook 2008-08-17 23:08:17 +00:00
jsorg71 a7b624056f the name changed 2008-08-17 07:23:56 +00:00
jsorg71 70321aa6c6 add instfiles 2008-08-17 07:17:58 +00:00
jsorg71 f6c0f1770e rename xrdp to xrdp.sh 2008-05-06 06:30:59 +00:00
jsorg71 59645cf803 rename xrdp_control.sh to xrdp 2008-04-30 04:38:17 +00:00
jsorg71 808ade37e8 rename sesman to xrdp-sesman 2008-04-29 07:51:34 +00:00
jsorg71 37439e5e22 more portable start / stop script 2007-04-29 06:38:30 +00:00
jsorg71 ced52dc681 more portable start / stop script 2007-04-29 06:19:13 +00:00
jsorg71 b611452d6b xrdp_control.sh is a bash script 2007-02-03 23:09:08 +00:00
jsorg71 aefa66e3a2 remove old files 2007-01-16 07:33:17 +00:00
jsorg71 1ed935186d added chkconfig support for newer versions 2006-12-26 07:34:33 +00:00
jsorg71 aac9f71e5b added xrdp_control1.sh for package installs 2006-08-07 03:28:04 +00:00
jsorg71 e18da60e8f its xrdp_control.sh, not xrdp_daemon 2006-06-07 16:27:43 +00:00
jsorg71 192446c47e documentation and script file changes 2006-02-18 05:42:59 +00:00
jsorg71 da4df86fc0 xrdp.pid cleanup too 2006-02-12 19:29:16 +00:00
jsorg71 685e679235 added xrdp_control.sh 2006-02-04 19:19:34 +00:00
jsorg71 a982572254 minor xrdpstart.sh changes 2005-11-06 01:49:33 +00:00
jsorg71 154bf097e6 rdp module 2005-11-03 03:33:23 +00:00
jsorg71 c4bf563e81 libradop -> librdp 2005-11-03 02:19:57 +00:00
ilsimo 2b54d20e65 Added new sesman config options and fixed startup script 2005-10-23 21:50:08 +00:00
jsorg71 ed57c43dc8 update sesman.ini 2005-09-27 23:56:18 +00:00
jsorg71 27abee98ce make pam the default and install the pam.d file 2005-09-20 01:34:53 +00:00
jsorg71 d754fe660e switch to sesman for pam control file 2005-09-20 01:18:07 +00:00
jsorg71 0b29907801 add radop item 2005-08-18 00:15:59 +00:00
jsorg71 86ecad1197 added instfiles 2005-06-04 23:48:50 +00:00