From d114886a107bbf8d9cf01636c8ae24dfded99540 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 1 Aug 2018 15:39:18 -0400 Subject: [PATCH] Relocate rsync to stx-integ/base/rsync Move content from stx-gplv3 into stx-integ Packages will be relocated to stx-integ: base/ anaconda crontabs dnsmasq rsync database/ python-psycopg2 filesystem/ parted grub/ grub2 security/ python-keyring Change-Id: I350b213f6e765f7e941f8de8cd483ebfd45bc966 Story: 2002801 Task: 22687 Signed-off-by: Scott Little --- base/rsync/centos/build_srpm.data | 2 + ...te-package-versioning-for-TIS-format.patch | 27 ++++++ base/rsync/centos/meta_patches/PATCH_ORDER | 1 + base/rsync/centos/srpm_path | 1 + base/rsync/files/rsyncd | 93 +++++++++++++++++++ base/rsync/files/rsyncd.conf | 51 ++++++++++ centos_pkg_dirs | 1 + 7 files changed, 176 insertions(+) create mode 100644 base/rsync/centos/build_srpm.data create mode 100644 base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch create mode 100644 base/rsync/centos/meta_patches/PATCH_ORDER create mode 100644 base/rsync/centos/srpm_path create mode 100755 base/rsync/files/rsyncd create mode 100644 base/rsync/files/rsyncd.conf diff --git a/base/rsync/centos/build_srpm.data b/base/rsync/centos/build_srpm.data new file mode 100644 index 000000000..2c93764a1 --- /dev/null +++ b/base/rsync/centos/build_srpm.data @@ -0,0 +1,2 @@ +COPY_LIST="$PKG_BASE/files/rsyncd.conf" +TIS_PATCH_VER=1 diff --git a/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch new file mode 100644 index 000000000..ca0acc301 --- /dev/null +++ b/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -0,0 +1,27 @@ +From 20f4e2f0f19c6d0e9c8ee1314481bc8e85dbd5bb Mon Sep 17 00:00:00 2001 +From: Scott Little +Date: Mon, 2 Oct 2017 16:32:24 -0400 +Subject: [PATCH 1/1] WRS: 0001-Update-package-versioning-for-TIS-format.patch + +Conflicts: + SPECS/rsync.spec +--- + SPECS/rsync.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SPECS/rsync.spec b/SPECS/rsync.spec +index 85b01f2..310b284 100644 +--- a/SPECS/rsync.spec ++++ b/SPECS/rsync.spec +@@ -8,7 +8,7 @@ + Summary: A program for synchronizing files over a network + Name: rsync + Version: 3.0.9 +-Release: 18%{?prerelease}%{?dist} ++Release: 18.el7%{?_tis_dist}.%{tis_patch_ver} + Group: Applications/Internet + URL: http://rsync.samba.org/ + +-- +1.9.1 + diff --git a/base/rsync/centos/meta_patches/PATCH_ORDER b/base/rsync/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..91f9a80ea --- /dev/null +++ b/base/rsync/centos/meta_patches/PATCH_ORDER @@ -0,0 +1 @@ +0001-Update-package-versioning-for-TIS-format.patch diff --git a/base/rsync/centos/srpm_path b/base/rsync/centos/srpm_path new file mode 100644 index 000000000..1780040a7 --- /dev/null +++ b/base/rsync/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/rsync-3.0.9-18.el7.src.rpm diff --git a/base/rsync/files/rsyncd b/base/rsync/files/rsyncd new file mode 100755 index 000000000..df550bad2 --- /dev/null +++ b/base/rsync/files/rsyncd @@ -0,0 +1,93 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: rsyncd +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: RSYNC daemon +# Description: RSYNC daemon +### END INIT INFO + +DESC="rsyncd" +DAEMON="/usr/bin/rsync" +RUNDIR="/var/run" +PIDFILE="${RUNDIR}/rsyncd.pid" +OPTIONS="--daemon --config=/etc/rsyncd.conf" + + +start() +{ + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} ]; then + echo "$DESC already running." + exit 0 + else + echo "Removing stale PID file $PIDFILE" + rm -f $PIDFILE + fi + fi + + echo -n "Starting $DESC..." + mkdir -p $RUNDIR + start-stop-daemon --start --quiet --background \ + --pidfile ${PIDFILE} --exec ${DAEMON} \ + -- $OPTIONS + + if [ $? -eq 0 ]; then + echo "done." + else + echo "failed." + exit 1 + fi +} + +stop() +{ + echo -n "Stopping $DESC..." + start-stop-daemon --stop --quiet --pidfile $PIDFILE + if [ $? -eq 0 ]; then + echo "done." + else + echo "failed." + fi + rm -f $PIDFILE +} + +status() +{ + pid=`cat $PIDFILE 2>/dev/null` + if [ -n "$pid" ]; then + if ps -p $pid &>/dev/null ; then + echo "$DESC is running" + exit 0 + else + echo "$DESC is not running but has pid file" + exit 1 + fi + fi + echo "$DESC is not running" + exit 3 +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|force-reload|reload) + stop + start + ;; + status) + status + ;; + *) + echo "Usage: $0 {start|stop|force-reload|restart|reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/base/rsync/files/rsyncd.conf b/base/rsync/files/rsyncd.conf new file mode 100644 index 000000000..8b56742b8 --- /dev/null +++ b/base/rsync/files/rsyncd.conf @@ -0,0 +1,51 @@ +# /etc/rsyncd.conf + +# Configuration file for rsync daemon +# See rsync(1) and rsyncd.conf(5) man pages for help + +# This file is required by rsync --daemon +pid file = /var/run/rsyncd.pid +use chroot = yes +read only = yes + +# Simple example for enabling your own local rsync server +#[everything] +# path = / +# comment = Everything except /etc exposed +# exclude = /etc + +[patching] + path = /opt/patching + comment = Patching filesystem + uid = root + read only = no + +[repo] + path = /www/pages/updates + comment = Patching repo + uid = root + read only = no + +[platform] + path = /etc/platform + comment = Platform configuration + uid = root + read only = no + +[certificate] + path = /etc/ssl/private + comment = SSL certificate + uid = root + read only = no + +[instances] + path = /etc/nova/instances + comment = Nova instances data + uid = root + read only = no + +[cacert] + path = /etc/ssl/certs + comment = SSL ca certificate + uid = root + read only = no diff --git a/centos_pkg_dirs b/centos_pkg_dirs index e128a0ca3..1a9c87074 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -142,3 +142,4 @@ networking/iptables database/python-psycopg2 base/crontabs base/dnsmasq +base/rsync