|
 |
fe5aa1 |
From fc08bd9a51b4bf576f7d6c1df6fb3f3d8dba26c1 Mon Sep 17 00:00:00 2001
|
|
|
fe5aa1 |
From: Peter Jones <pjones@redhat.com>
|
|
|
fe5aa1 |
Date: Tue, 9 Jun 2015 16:00:00 -0400
|
|
|
fe5aa1 |
Subject: [PATCH 09/15] Add "install" targets for 3c2374b and make the
|
|
|
fe5aa1 |
filenames a little nicer.
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
Related: rhbz#1141263
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
fe5aa1 |
(cherry picked from commit 95195477dac72d4fcc09726314da4a8dd3552d49)
|
|
|
fe5aa1 |
---
|
|
|
fe5aa1 |
src/Makefile | 6 ++++++
|
|
|
fe5aa1 |
src/pesign-authorize-groups | 4 ++--
|
|
|
fe5aa1 |
src/pesign-authorize-users | 4 ++--
|
|
|
fe5aa1 |
3 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
diff --git a/src/Makefile b/src/Makefile
|
|
|
fe5aa1 |
index 766ffe8..6b1e582 100644
|
|
|
fe5aa1 |
--- a/src/Makefile
|
|
|
fe5aa1 |
+++ b/src/Makefile
|
|
|
fe5aa1 |
@@ -72,6 +72,12 @@ install_systemd:
|
|
|
fe5aa1 |
$(INSTALL) -m 644 tmpfiles.conf $(INSTALLROOT)/usr/lib/tmpfiles.d/pesign.conf
|
|
|
fe5aa1 |
$(INSTALL) -d -m 755 $(INSTALLROOT)/usr/lib/systemd/system/
|
|
|
fe5aa1 |
$(INSTALL) -m 644 pesign.service $(INSTALLROOT)/usr/lib/systemd/system/
|
|
|
fe5aa1 |
+ $(INSTALL) -d -m 755 $(INSTALLROOT)$(PREFIX)/sbin/
|
|
|
fe5aa1 |
+ $(INSTALL) -m 755 pesign-authorize-users $(INSTALLROOT)$(PREFIX)/sbin/pesign-authorize-users
|
|
|
fe5aa1 |
+ $(INSTALL) -m 755 pesign-authorize-groups $(INSTALLROOT)$(PREFIX)/sbin/pesign-authorize-groups
|
|
|
fe5aa1 |
+ $(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pesign
|
|
|
fe5aa1 |
+ $(INSTALL) -m 600 /dev/null $(INSTALLROOT)/etc/pesign/users
|
|
|
fe5aa1 |
+ $(INSTALL) -m 600 /dev/null $(INSTALLROOT)/etc/pesign/groups
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
install_sysvinit:
|
|
|
fe5aa1 |
$(INSTALL) -d -m 755 $(INSTALLROOT)/etc/rc.d/init.d/
|
|
|
fe5aa1 |
diff --git a/src/pesign-authorize-groups b/src/pesign-authorize-groups
|
|
|
fe5aa1 |
index 1048904..e3864ce 100644
|
|
|
fe5aa1 |
--- a/src/pesign-authorize-groups
|
|
|
fe5aa1 |
+++ b/src/pesign-authorize-groups
|
|
|
fe5aa1 |
@@ -9,8 +9,8 @@
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
# License: GPLv2
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
-if [[ -r /etc/pesign/authorize-groups ]]; then
|
|
|
fe5aa1 |
- for group in $(cat /etc/pesign/authorize-groups); do
|
|
|
fe5aa1 |
+if [[ -r /etc/pesign/groups ]]; then
|
|
|
fe5aa1 |
+ for group in $(cat /etc/pesign/groups); do
|
|
|
fe5aa1 |
setfacl -m g:${group}:rx /var/run/pesign
|
|
|
fe5aa1 |
setfacl -m g:${group}:rw /var/run/pesign/socket
|
|
|
fe5aa1 |
done
|
|
|
fe5aa1 |
diff --git a/src/pesign-authorize-users b/src/pesign-authorize-users
|
|
|
fe5aa1 |
index 1993570..e500204 100644
|
|
|
fe5aa1 |
--- a/src/pesign-authorize-users
|
|
|
fe5aa1 |
+++ b/src/pesign-authorize-users
|
|
|
fe5aa1 |
@@ -9,8 +9,8 @@
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
# License: GPLv2
|
|
|
fe5aa1 |
|
|
|
fe5aa1 |
-if [[ -r /etc/pesign/authorize-users ]]; then
|
|
|
fe5aa1 |
- for username in $(cat /etc/pesign/authorize-users); do
|
|
|
fe5aa1 |
+if [[ -r /etc/pesign/users ]]; then
|
|
|
fe5aa1 |
+ for username in $(cat /etc/pesign/users); do
|
|
|
fe5aa1 |
setfacl -m u:${username}:rx /var/run/pesign
|
|
|
fe5aa1 |
setfacl -m u:${username}:rw /var/run/pesign/socket
|
|
|
fe5aa1 |
done
|
|
|
fe5aa1 |
--
|
|
|
fe5aa1 |
2.5.5
|
|
|
fe5aa1 |
|