Date: Sunday, October 18, 2015 @ 16:46:12 Author: fyan Revision: 144326
upgpkg: jenkins 1.633-2 try to use sysusers.d Added: jenkins/trunk/jenkins.sysusers jenkins/trunk/jenkins.tmpfiles (from rev 144325, jenkins/trunk/jenkins.tmpfiles.d) Modified: jenkins/trunk/PKGBUILD jenkins/trunk/jenkins.install Deleted: jenkins/trunk/jenkins.tmpfiles.d --------------------+ PKGBUILD | 9 +++++--- jenkins.install | 56 +++------------------------------------------------ jenkins.sysusers | 2 + jenkins.tmpfiles | 1 jenkins.tmpfiles.d | 1 5 files changed, 13 insertions(+), 56 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-18 10:58:37 UTC (rev 144325) +++ PKGBUILD 2015-10-18 14:46:12 UTC (rev 144326) @@ -6,7 +6,7 @@ pkgname=jenkins pkgver=1.633 -pkgrel=1 +pkgrel=2 pkgdesc='Extendable continuous integration server (latest)' arch=('any') url='http://jenkins-ci.org/' @@ -22,12 +22,14 @@ # Rename to force re-download on new version 'jenkins.conf' 'jenkins.service' - 'jenkins.tmpfiles.d' + 'jenkins.tmpfiles' + 'jenkins.sysusers' 'LICENSE') sha512sums=('517735a4d707d77d979bcbb2f3631b5a527da9824eb91d1bb3741ddb4685f81b15cad6c4a20cb482eaad6f02863b9195d366968c00d63c44690cc426df107c29' '3a8421cef3953d899c150609f959cf5d5dd6d08d079a5e0f48bfece4f3c80491722b9e90ef841fddb87401c226b8338297c5c4e83e55a33ef8d6e387de3048d0' 'a336b006d3711abb75b49a2e12c09ee61cf3275a2cdbbd3676480e2f6ca8ba0fb4b9c08f3f9da193252c4fca827e9a1d5eaad847d0a889445693427ae1571fe7' 'a845a7147be54affc586dfce9a188ec24c92e673e88dec0b62da386d2e597de6ecda103429008562abd897f179a52c37cf2188ebc65b8c636efd07d707e18f90' + '896cbc64eadb2f3bb9fa7fc26dbfc527b1823d8bff3158be7f1936cc250f55eeafe89079e1ceb8f3d269041662573ccbbb36248140b4ba24144a564366f8847a' '0df6479a600db395c12ad29ebda3120d00460338b9a6b15913e2245aa29212a3798c32e664ca70c8034146e2e0b573066deec9e3210198202f753994e1b83efa') package() { @@ -35,7 +37,8 @@ install -Dm444 "jenkins-${pkgver}.war" "$pkgdir/usr/share/java/jenkins/jenkins.war" install -Dm644 jenkins.service \ "$pkgdir/usr/lib/systemd/system/jenkins.service" - install -Dm644 jenkins.tmpfiles.d "$pkgdir/usr/lib/tmpfiles.d/jenkins.conf" + install -Dm644 jenkins.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/jenkins.conf" + install -Dm644 jenkins.sysusers "$pkgdir/usr/lib/sysusers.d/jenkins.conf" install -Dm644 jenkins.conf "$pkgdir/etc/conf.d/jenkins" } Modified: jenkins.install =================================================================== --- jenkins.install 2015-10-18 10:58:37 UTC (rev 144325) +++ jenkins.install 2015-10-18 14:46:12 UTC (rev 144326) @@ -1,57 +1,9 @@ -#!/bin/sh - -_service_name=jenkins.service -_service_username=jenkins -_service_groupname="$_service_username" -_service_home_dir=/var/lib/jenkins -_service_tmpfiles_conf="$_service_username.conf" - -_is_systemd_service_enabled() { - /usr/bin/systemctl is-enabled --quiet "$_service_name" 2>/dev/null -} - post_install() { - getent passwd "$_service_username" > /dev/null || /usr/sbin/useradd \ - --system --user-group --home-dir "$_service_home_dir" --create-home \ - --shell '/bin/bash' --skel /dev/null "$_service_username" &> /dev/null - [ -n "$_service_tmpfiles_conf" ] && /usr/bin/systemd-tmpfiles \ - --create "$_service_tmpfiles_conf" 2>/dev/null - mkdir -p /var/lib/jenkins{,/jobs} - chown jenkins:jenkins /var/lib/jenkins{,/jobs} - echo 'This installation of Jenkins uses port 8090 by default.' - return 0 + systemd-sysusers jenkins.conf + [[ -d var/lib/jenkins ]] || install -dm 750 -o jenkins -g jenkins var/lib/jenkins + systemd-tmpfiles --create jenkins.conf } post_upgrade() { - [ -n "$_service_tmpfiles_conf" ] && systemd-tmpfiles \ - --create "$_service_tmpfiles_conf" 2>/dev/null - mkdir -p /var/lib/jenkins{,/jobs} - chown -R jenkins:jenkins /var/lib/jenkins - _is_systemd_service_enabled && cat <<EOF -=> Remember to issue the following commands: - sudo systemctl --system daemon-reload - sudo systemctl restart $_service_name -EOF - return 0 + (( $(vercmp $2 '1.633-1') < 0 )) && systemd-sysusers jenkins.conf || true } - -pre_remove() { - /usr/bin/systemctl stop $_service_name 2>/dev/null - _is_systemd_service_enabled && \ - /usr/bin/systemctl disable $_service_name 2>/dev/null - [ -n "$_service_tmpfiles_conf" ] && systemd-tmpfiles \ - --remove "$_service_tmpfiles_conf" - return 0 -} - -post_remove() { - getent passwd "$_service_username" > /dev/null && \ - /usr/sbin/userdel "$_service_username" 2>/dev/null - for dir in "$_service_home_dir"; do - [ -n "$dir" -a -d "$dir" ] && \ - echo "=> directory $dir needs to be removed manually" - done - return 0 -} - -# vim:set ts=2 sw=2 et: Added: jenkins.sysusers =================================================================== --- jenkins.sysusers (rev 0) +++ jenkins.sysusers 2015-10-18 14:46:12 UTC (rev 144326) @@ -0,0 +1,2 @@ +u jenkins - "Jenkins CI" /var/lib/jenkins +g jenkins - Copied: jenkins/trunk/jenkins.tmpfiles (from rev 144325, jenkins/trunk/jenkins.tmpfiles.d) =================================================================== --- jenkins.tmpfiles (rev 0) +++ jenkins.tmpfiles 2015-10-18 14:46:12 UTC (rev 144326) @@ -0,0 +1 @@ +d /var/cache/jenkins 0755 jenkins jenkins - Deleted: jenkins.tmpfiles.d =================================================================== --- jenkins.tmpfiles.d 2015-10-18 10:58:37 UTC (rev 144325) +++ jenkins.tmpfiles.d 2015-10-18 14:46:12 UTC (rev 144326) @@ -1 +0,0 @@ -d /var/cache/jenkins 0755 jenkins jenkins -