Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
LemonLDAP NG
lemonldap-ng
Commits
8740fdf5
Commit
8740fdf5
authored
Oct 12, 2016
by
Clément OUDOT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix FastCGI server systemd script / RPM in trunk (
#1093
)
parent
4eb987e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
Makefile
Makefile
+1
-1
fastcgi-server/systemd/llng-fastcgi-server.service
fastcgi-server/systemd/llng-fastcgi-server.service
+2
-0
rpm/lemonldap-ng.spec
rpm/lemonldap-ng.spec
+2
-0
No files found.
Makefile
View file @
8740fdf5
...
...
@@ -503,7 +503,7 @@ install_fastcgi_server:
@
chmod
+x
$(RSBINDIR)
/llng-fastcgi-server
@
cp
-f
fastcgi-server/rc/llng-fastcgi-server
$(RINITDIR)
@
cp
-f
fastcgi-server/default/llng-fastcgi-server
$(RETCDEFAULTDIR)
@
$(PERL)
-pi
-e
's#__SBINDIR__#
$(SBINDIR)
#;s#__DEFAULTDIR__#
$(ETCDEFAULTDIR)
#;s#__FASTCGISOCKDIR__#
$(FASTCGISOCKDIR)
#g;
s#__USER__#
$(FASTCGIUSER)
#;s#__GROUP__#
$(FASTCGIGROUP)
#;
'
\
@
$(PERL)
-pi
-e
's#__SBINDIR__#
$(SBINDIR)
#;s#__DEFAULTDIR__#
$(ETCDEFAULTDIR)
#;s#__FASTCGISOCKDIR__#
$(FASTCGISOCKDIR)
#g;'
\
$(RETCDEFAULTDIR)
/llng-fastcgi-server
\
$(RSBINDIR)
/llng-fastcgi-server
\
$(RINITDIR)
/llng-fastcgi-server
...
...
fastcgi-server/systemd/llng-fastcgi-server.service
View file @
8740fdf5
...
...
@@ -6,6 +6,8 @@ After=network.target
Type
=
forking
EnvironmentFile
=
/etc/default/llng-fastcgi-server
PIDFile
=
__FASTCGISOCKDIR__/llng-fastcgi-server.pid
ExecStartPre
=
-/bin/mkdir __FASTCGISOCKDIR__
ExecStartPre
=
/bin/chown __USER__:__GROUP__ __FASTCGISOCKDIR__
ExecStart
=
__SBINDIR__/llng-fastcgi-server
ExecStop
=
-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile ${PID}
KillMode
=
mixed
...
...
rpm/lemonldap-ng.spec
View file @
8740fdf5
...
...
@@ -393,6 +393,8 @@ mkdir -p %{buildroot}%{_unitdir}
install -m644 fastcgi-server/systemd/llng-fastcgi-server.service %{buildroot}%{_unitdir}
sed -i 's:__FASTCGISOCKDIR__:/var/run/llng-fastcgi-server:' %{buildroot}%{_unitdir}/llng-fastcgi-server.service
sed -i 's:__SBINDIR__:/usr/share/lemonldap-ng/sbin:' %{buildroot}%{_unitdir}/llng-fastcgi-server.service
sed -i 's:__USER__:%{lm_apacheuser}:' %{buildroot}%{_unitdir}/llng-fastcgi-server.service
sed -i 's:__GROUP__:%{lm_apachegroup}:' %{buildroot}%{_unitdir}/llng-fastcgi-server.service
# Set apache user in some files (see Makefile)
# Note: we do not use the APACHEUSER and APACHEGROUP in make install
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment