commit c8d44c0ca9a9d6c99ee37a539501075b4c53170e
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Apr 9 14:48:04 2014 +0200
Do not inherit default configuration from tomcat
- Tweak permissions
.gitignore | 1 +
jenkins.spec | 31 +++++++++++++++++++------------
sources | 1 +
3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0773a85..78b72cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/jenkins-1.549.tar.gz
/LICENSE-2.0.txt
/jenkins-1.557.tar.gz
+/jenkins-conf.zip
diff --git a/jenkins.spec b/jenkins.spec
index 26d9cfb..795ae5e 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -8,7 +8,7 @@
Name: jenkins
Version: 1.557
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -27,6 +27,8 @@ Source2: CDDL-LICENSE
Source4: jenkins-sysconfig
Source5: context.xml
Source6: jenkins.service
+# default configuration for Jenkins (based on tomcat's default configuration)
+Source7: jenkins-conf.zip
# animal sniffer is not really useful in Fedora
Patch1: remove-animal-sniffer-annotations.patch
@@ -49,7 +51,7 @@ Patch13: remove-windows-support.patch
Patch14: remove-windows-support-from-process-tree.patch
Patch15: remove-dotnet-support.patch
Patch16: remove-windows-installer-support.patch
-# exclude pristine xstream from build (Fedora specific, we use different lib than
upstream)
+# exclude pristine xstream from build (Fedora specific, we use different libs than
upstream)
Patch17: exclude-xstream.patch
BuildArch: noarch
@@ -543,12 +545,11 @@ pushd %{buildroot}/%{_datadir}/%{name}/catalina_base
ln -s %{_javadir}/tomcat lib
ln -s %{homedir}/webapp webapps/jenkins
- # FIXME: carry our own default configuration
- # this is fragile
- cp -r %{_sysconfdir}/tomcat/* %{buildroot}/%{_sysconfdir}/jenkins || :
- sed -i
's|TOMCATS_BASE="/var/lib/tomcats/"|CATALINA_BASE="/usr/share/jenkins/catalina_base"|'
%{buildroot}/%{_sysconfdir}/jenkins/tomcat.conf
- sed -i
's|CATALINA_TMPDIR="/var/cache/tomcat/temp"|CATALINA_TMPDIR="/var/cache/jenkins/temp"|'
%{buildroot}/etc/jenkins/tomcat.conf
- ln -s /%{_sysconfdir}/jenkins conf
+ unzip %{SOURCE7}
+ mv conf/* %{buildroot}/%{_sysconfdir}/jenkins
+ rmdir conf
+
+ ln -s %{_sysconfdir}/jenkins conf
popd
# symlink remoting and cli JAR into WEB-INF/
@@ -591,11 +592,13 @@ exit 0
%doc LICENSE.txt LICENSE-ASL-2.0.txt LICENSE-CDDL.txt
%files
-%attr(0770, root, jenkins) %{_sysconfdir}/jenkins
+%defattr(0664, jenkins, jenkins, 0755)
+%{_sysconfdir}/jenkins
+%attr(0660, jenkins, jenkins) %{_sysconfdir}/jenkins/tomcat-users.xml
%{_unitdir}/%{name}.service
%{_datadir}/%{name}/catalina_base
-%attr(0770, root, jenkins) %{_localstatedir}/cache/jenkins
-%attr(0770, root, jenkins) %{_localstatedir}/log/jenkins
+%attr(0770, jenkins, jenkins) %{_localstatedir}/cache/jenkins
+%attr(0770, jenkins, jenkins) %{_localstatedir}/log/jenkins
%files plugins-pom -f .mfiles-plugins-pom
@@ -607,7 +610,7 @@ exit 0
%files webapp
%{homedir}/webapp/*
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%attr(0770, root, jenkins) %dir %{_sharedstatedir}/jenkins
+%attr(0770, jenkins, jenkins) %dir %{_sharedstatedir}/jenkins
%doc LICENSE.txt
%endif # bootstrap
@@ -615,6 +618,10 @@ exit 0
%doc LICENSE.txt
%changelog
+* Wed Apr 09 2014 Michal Srb <msrb(a)redhat.com> - 1.557-12
+- Do not inherit default configuration from tomcat
+- Tweak permissions
+
* Mon Apr 07 2014 Michal Srb <msrb(a)redhat.com> - 1.557-11
- Run as a separate service
diff --git a/sources b/sources
index 8513996..77d4918 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
8e7cec042cba7b8b7968ebbf0e9fcc8a jenkins-1.557.tar.gz
+6fbb85cc80bf5629f78d1f4e37b6e1a3 jenkins-conf.zip
Show replies by date