Fix some issues with FastCGI server and RPM (#932)
This commit is contained in:
parent
dcb9af2d4b
commit
6da3244ae7
6
Makefile
6
Makefile
|
@ -461,16 +461,16 @@ install_fastcgi_server:
|
||||||
@$(PERL) -pi -e 's#__SBINDIR__#$(SBINDIR)#;s#__DEFAULTDIR__#$(ETCDEFAULTDIR)#;s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g' \
|
@$(PERL) -pi -e 's#__SBINDIR__#$(SBINDIR)#;s#__DEFAULTDIR__#$(ETCDEFAULTDIR)#;s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g' \
|
||||||
$(RETCDEFAULTDIR)/llng-fastcgi-server \
|
$(RETCDEFAULTDIR)/llng-fastcgi-server \
|
||||||
$(RSBINDIR)/llng-fastcgi-server \
|
$(RSBINDIR)/llng-fastcgi-server \
|
||||||
$(RSBINDIR)/llng-fastcgi-server
|
$(RINITDIR)/llng-fastcgi-server
|
||||||
@if [ ! "$(FASTCGIUSER)" ]; then \
|
@if [ ! "$(FASTCGIUSER)" ]; then \
|
||||||
$(PERL) -pi -e 's#__USER__#nobody#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
$(PERL) -pi -e 's#__USER__#nobody#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
||||||
else \
|
else \
|
||||||
$(PERL) -pi -e 's#__USER__#$(FASTCGIUSER)#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
$(PERL) -pi -e 's#__USER__#$(FASTCGIUSER)#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
||||||
fi
|
fi
|
||||||
@if [ ! "$(FASTCGIGROUP)" ]; then \
|
@if [ ! "$(FASTCGIGROUP)" ]; then \
|
||||||
$(PERL) -pi -e 's#__USER__#nobody#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
$(PERL) -pi -e 's#__GROUP__#nobody#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
||||||
else \
|
else \
|
||||||
$(PERL) -pi -e 's#__USER__#$(FASTCGIGROUP)#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
$(PERL) -pi -e 's#__GROUP__#$(FASTCGIGROUP)#' $(RETCDEFAULTDIR)/llng-fastcgi-server; \
|
||||||
fi
|
fi
|
||||||
if [ "$(FASTCGIUSER)" != "" ]; then \
|
if [ "$(FASTCGIUSER)" != "" ]; then \
|
||||||
chown $(FASTCGIUSER) $(RFASTCGISOCKDIR) || exit 1; \
|
chown $(FASTCGIUSER) $(RFASTCGISOCKDIR) || exit 1; \
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
#NPROC = 7
|
#NPROC = 7
|
||||||
|
|
||||||
# Unix socket to listen to
|
# Unix socket to listen to
|
||||||
#SOCKET = __FASTCGISOCKDIR__/llng-fastcgi.sock
|
#SOCKET=__FASTCGISOCKDIR__/llng-fastcgi.sock
|
||||||
|
|
||||||
# Pid file
|
# Pid file
|
||||||
#PID = __FASTCGISOCKDIR__/llng-fastcgi-server.pid
|
#PID=__FASTCGISOCKDIR__/llng-fastcgi-server.pid
|
||||||
|
|
||||||
# User and GROUP
|
# User and GROUP
|
||||||
USER = __USER__
|
/bin/bash: q : commande introuvable
|
||||||
GROUP = __GROUP__
|
GROUP=__GROUP__
|
||||||
|
|
|
@ -6,7 +6,7 @@ After=network.target
|
||||||
Type=forking
|
Type=forking
|
||||||
EnvironmentFile=/etc/default/llng-fastcgi-server
|
EnvironmentFile=/etc/default/llng-fastcgi-server
|
||||||
PIDFile=__FASTCGISOCKDIR__/llng-fastcgi-server.pid
|
PIDFile=__FASTCGISOCKDIR__/llng-fastcgi-server.pid
|
||||||
ExecStart=/usr/sbin/llng-fastcgi-server
|
ExecStart=__SBINDIR__/llng-fastcgi-server
|
||||||
ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile ${PID}
|
ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile ${PID}
|
||||||
KillMode=mixed
|
KillMode=mixed
|
||||||
|
|
||||||
|
|
|
@ -102,8 +102,9 @@ BuildRequires: perl(Mouse)
|
||||||
BuildRequires: perl(Digest::SHA)
|
BuildRequires: perl(Digest::SHA)
|
||||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||||
BuildRequires: perl(Env)
|
BuildRequires: perl(Env)
|
||||||
|
BuildRequires: systemd
|
||||||
%else
|
%else
|
||||||
BuildRequires: perl-Regexp-Assemble, perl-Regexp-Common, perl-Authen-Captcha, perl-Cache-Cache, perl-Apache-Session, perl-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone, perl-Net-CIDR-Lite, perl-Unicode-String, perl-Mouse, perl-Digest-SHA, perl-ExtUtims-MakeMaker, perl-Env
|
BuildRequires: perl-Regexp-Assemble, perl-Regexp-Common, perl-Authen-Captcha, perl-Cache-Cache, perl-Apache-Session, perl-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone, perl-Net-CIDR-Lite, perl-Unicode-String, perl-Mouse, perl-Digest-SHA, perl-ExtUtims-MakeMaker, perl-Env, systemd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhl}%{?rhel}%{?fedora}
|
%if 0%{?rhl}%{?rhel}%{?fedora}
|
||||||
|
@ -385,6 +386,12 @@ find %{buildroot} -name .packlist -exec rm -f {} \;
|
||||||
find %{buildroot} -name perllocal.pod -exec rm -f {} \;
|
find %{buildroot} -name perllocal.pod -exec rm -f {} \;
|
||||||
find %{buildroot} -name *.bak -exec rm -f {} \;
|
find %{buildroot} -name *.bak -exec rm -f {} \;
|
||||||
|
|
||||||
|
# Install files for FastCGI Server
|
||||||
|
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
|
||||||
|
|
||||||
# Set apache user in some files (see Makefile)
|
# Set apache user in some files (see Makefile)
|
||||||
# Note: we do not use the APACHEUSER and APACHEGROUP in make install
|
# Note: we do not use the APACHEUSER and APACHEGROUP in make install
|
||||||
# because it launches a 'chown', which is not permitted if RPM is not
|
# because it launches a 'chown', which is not permitted if RPM is not
|
||||||
|
@ -392,6 +399,7 @@ find %{buildroot} -name *.bak -exec rm -f {} \;
|
||||||
sed -i 's/nobody/%{lm_apacheuser}/' %{buildroot}%{_sysconfdir}/cron.d/*
|
sed -i 's/nobody/%{lm_apacheuser}/' %{buildroot}%{_sysconfdir}/cron.d/*
|
||||||
sed -i 's/nobody/%{lm_apacheuser}/' %{buildroot}%{lm_sharedir}/bin/lmConfigEditor
|
sed -i 's/nobody/%{lm_apacheuser}/' %{buildroot}%{lm_sharedir}/bin/lmConfigEditor
|
||||||
sed -i 's/nobody/%{lm_apacheuser}/g' %{buildroot}%{lm_sharedir}/bin/lemonldap-ng-cli
|
sed -i 's/nobody/%{lm_apacheuser}/g' %{buildroot}%{lm_sharedir}/bin/lemonldap-ng-cli
|
||||||
|
sed -i 's/nobody/%{lm_apacheuser}/g' %{buildroot}/etc/default/llng-fastcgi-server
|
||||||
|
|
||||||
# Set UNIX rights
|
# Set UNIX rights
|
||||||
mkdir -p %{buildroot}%{lm_vardir}/sessions/lock
|
mkdir -p %{buildroot}%{lm_vardir}/sessions/lock
|
||||||
|
@ -405,6 +413,7 @@ chmod 770 %{buildroot}%{lm_vardir}/psessions
|
||||||
chmod 770 %{buildroot}%{lm_vardir}/psessions/lock
|
chmod 770 %{buildroot}%{lm_vardir}/psessions/lock
|
||||||
chmod 770 %{buildroot}%{lm_vardir}/notifications
|
chmod 770 %{buildroot}%{lm_vardir}/notifications
|
||||||
chmod 770 %{buildroot}%{lm_vardir}/captcha
|
chmod 770 %{buildroot}%{lm_vardir}/captcha
|
||||||
|
chmod 775 %{buildroot}%{lm_sharedir}/sbin/llng-fastcgi-server
|
||||||
|
|
||||||
# Touch for ghost
|
# Touch for ghost
|
||||||
mkdir -p %buildroot%{apache_confdir}
|
mkdir -p %buildroot%{apache_confdir}
|
||||||
|
@ -565,6 +574,7 @@ rm -rf %{buildroot}
|
||||||
%{lm_sharedir}/sbin/llng-fastcgi-server
|
%{lm_sharedir}/sbin/llng-fastcgi-server
|
||||||
%config(noreplace) /etc/default/llng-fastcgi-server
|
%config(noreplace) /etc/default/llng-fastcgi-server
|
||||||
/etc/init.d/llng-fastcgi-server
|
/etc/init.d/llng-fastcgi-server
|
||||||
|
%{_unitdir}/llng-fastcgi-server.service
|
||||||
|
|
||||||
%files -n perl-Lemonldap-NG-Common
|
%files -n perl-Lemonldap-NG-Common
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user