add lost sudoers

3 files changed, 31 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7906e7198b4d..aa0a1482db2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openstack-nova
 	pkgdesc = Cloud computing fabric controller
 	pkgver = 22.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://docs.openstack.org/nova/latest/
 	arch = any
 	license = Apache
@@ -125,6 +125,7 @@ pkgbase = openstack-nova
 	source = openstack-nova-novncproxy.service
 	source = openstack-nova-os-compute-api.service
 	source = openstack-nova-scheduler.service
+	source = sudoers.conf
 	source = sysusers.conf
 	source = tmpfiles.conf
 	md5sums = c186cca0778eedf936fe4dd1d15e036b
@@ -135,8 +136,9 @@ pkgbase = openstack-nova
 	md5sums = 9dbc29e1a098cce899a80db4c70135af
 	md5sums = 4c111886b0d64b5983d5f03b49e4dd9f
 	md5sums = de818eb31a86aaf4ae47bbf49a011a21
+	md5sums = 063c88893366f685c380fae0aa678b15
 	md5sums = fdc38aa4d35b511165091aac88c6614d
-	md5sums = a48b86a69b8875a250b59e628b21656e
+	md5sums = c526c7def15d56ada9f2e692d254ce90
 	sha256sums = dd2561a576f8f0c38e545e2cf71c896740bf64b40ac991537af1dec3d1fea3a1
 	sha256sums = ccee044c78f73566662b46ae1d2837b34fa998e607a5b965dff85c5042eb21de
 	sha256sums = 14c3724e55fa7d094cc95c334d564c5b2276d73bbf3771de6fa2c8acaab9f71b
@@ -145,8 +147,9 @@ pkgbase = openstack-nova
 	sha256sums = d23df8531a2d395797a21c6f1a523b0d707ae45a098ab1500025c3ed7eb23b17
 	sha256sums = b4634822f93365a3a3b4133fe51698e307383936d8270a9e07a0e5cfb433db05
 	sha256sums = 5b6276b3480d30fc402a980e073e437fd81818cc024d1a04192bc6239177ad9d
+	sha256sums = a8101096ca72a2f70d003c54b3339d16697315380795d657134cf9c02388a49f
 	sha256sums = ed64bd90f87a3c41ed57e8fea77055d9df85ed6229bd3f75d74627c42322eb4c
-	sha256sums = ca016a183d7e54570ae6f6fcc2338b89518de5a886514b257e4138a5a822e1bc
+	sha256sums = 455e52b729fe19a31316f4770988129ac82b2984794d17a43e7526ecc368f11f
 	sha512sums = acb9745b2bebd669f919a2d3d73e9dc5dad5aa3de49690daddd779fb6467139f857d67c6d8af3761f12db9bf6c5120d1af7bee3e73b3c0e0c44d6b41cafe7883
 	sha512sums = bcd6c94e9d882528b4883fa947822e6dbea6ca8b438815556471f54f8f5bd8b413f0906d4cc210a85891fef09846972689d7d4c25ed1ae8a582fd413c22c4820
 	sha512sums = df839698bf257be1de5ed667c1c8f3c53c9384e549edc79b0988edae366ea6c10aff96ca9bbfb272852f5dd2348fbf1ea95c610ef261a771e8e6ca42b3448abc
@@ -155,8 +158,9 @@ pkgbase = openstack-nova
 	sha512sums = 093d8db5544b7baf1522098d73ffa55f36bd3a75c49db5643027bcea999aad32b9b97840bf979fd42f5fa2609a0e5b0a5188bf3c43f8298fcca88205d461dc3b
 	sha512sums = 46faac9c58576a6c658a177ab0d567aa8945ce0ca170ac639f4565dc23c694b93e532da51d7a220a5fa964d6334af008b0bb1c5fd49dc2a6cd74d0e17ed8c46d
 	sha512sums = 3e0671510a19f700f75d5d0efc98ae49a1616984f0abbadf19c0f9732bce6700b5fde436933a90906426877a2c52fcdb1c0b643f97781df8169808847388e850
+	sha512sums = b2351829821824724106663a64e1237c01cec99ea5c503e92611fcceb32a1c10e85c59fee020a75e05748a8a82d89e08edaeb8f62a52843673dd59e5cfb4f6c4
 	sha512sums = 77a3849f4604fdb4293dbaf7341f9dab62b6e2df82eeab5baa728ed5ae9b3d0ac73f4fd924aee2271d6696ba5c26a50ff21f2a2a452515b8a4a2c12e9fd6a7e9
-	sha512sums = a1dab8ab925fc43522e93b3a661468b727d9b5da34d490d7768f464b48e0edf5b9ebc696c645755c87eccad84e9ae26e10e2a0362839fe426f3a6e3f1df5ea09
+	sha512sums = 11407608510ea92b46a031e6bac459032ebefe4a66f192b2f3798e475e66a9f99bc33b48d930ca0736c496d52dffeb86b84937a960ad73ba91abcabb0b758778
 
 pkgname = openstack-nova
 
diff --git a/PKGBUILD b/PKGBUILD
index cd78b3893999..f374e2b2e222 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pyname=nova
 pkgbase=openstack-$_pyname
 pkgname=(openstack-$_pyname{,-doc})
 pkgver=22.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cloud computing fabric controller"
 arch=('any')
 url="https://docs.openstack.org/nova/latest/"
@@ -136,6 +136,7 @@ source=(
 	openstack-nova-novncproxy.service
 	openstack-nova-os-compute-api.service
 	openstack-nova-scheduler.service
+	sudoers.conf
 	sysusers.conf
 	tmpfiles.conf
 )
@@ -147,8 +148,9 @@ md5sums=('c186cca0778eedf936fe4dd1d15e036b'
          '9dbc29e1a098cce899a80db4c70135af'
          '4c111886b0d64b5983d5f03b49e4dd9f'
          'de818eb31a86aaf4ae47bbf49a011a21'
+         '063c88893366f685c380fae0aa678b15'
          'fdc38aa4d35b511165091aac88c6614d'
-         'a48b86a69b8875a250b59e628b21656e')
+         'c526c7def15d56ada9f2e692d254ce90')
 sha256sums=('dd2561a576f8f0c38e545e2cf71c896740bf64b40ac991537af1dec3d1fea3a1'
             'ccee044c78f73566662b46ae1d2837b34fa998e607a5b965dff85c5042eb21de'
             '14c3724e55fa7d094cc95c334d564c5b2276d73bbf3771de6fa2c8acaab9f71b'
@@ -157,8 +159,9 @@ sha256sums=('dd2561a576f8f0c38e545e2cf71c896740bf64b40ac991537af1dec3d1fea3a1'
             'd23df8531a2d395797a21c6f1a523b0d707ae45a098ab1500025c3ed7eb23b17'
             'b4634822f93365a3a3b4133fe51698e307383936d8270a9e07a0e5cfb433db05'
             '5b6276b3480d30fc402a980e073e437fd81818cc024d1a04192bc6239177ad9d'
+            'a8101096ca72a2f70d003c54b3339d16697315380795d657134cf9c02388a49f'
             'ed64bd90f87a3c41ed57e8fea77055d9df85ed6229bd3f75d74627c42322eb4c'
-            'ca016a183d7e54570ae6f6fcc2338b89518de5a886514b257e4138a5a822e1bc')
+            '455e52b729fe19a31316f4770988129ac82b2984794d17a43e7526ecc368f11f')
 sha512sums=('acb9745b2bebd669f919a2d3d73e9dc5dad5aa3de49690daddd779fb6467139f857d67c6d8af3761f12db9bf6c5120d1af7bee3e73b3c0e0c44d6b41cafe7883'
             'bcd6c94e9d882528b4883fa947822e6dbea6ca8b438815556471f54f8f5bd8b413f0906d4cc210a85891fef09846972689d7d4c25ed1ae8a582fd413c22c4820'
             'df839698bf257be1de5ed667c1c8f3c53c9384e549edc79b0988edae366ea6c10aff96ca9bbfb272852f5dd2348fbf1ea95c610ef261a771e8e6ca42b3448abc'
@@ -167,8 +170,9 @@ sha512sums=('acb9745b2bebd669f919a2d3d73e9dc5dad5aa3de49690daddd779fb6467139f857
             '093d8db5544b7baf1522098d73ffa55f36bd3a75c49db5643027bcea999aad32b9b97840bf979fd42f5fa2609a0e5b0a5188bf3c43f8298fcca88205d461dc3b'
             '46faac9c58576a6c658a177ab0d567aa8945ce0ca170ac639f4565dc23c694b93e532da51d7a220a5fa964d6334af008b0bb1c5fd49dc2a6cd74d0e17ed8c46d'
             '3e0671510a19f700f75d5d0efc98ae49a1616984f0abbadf19c0f9732bce6700b5fde436933a90906426877a2c52fcdb1c0b643f97781df8169808847388e850'
+            'b2351829821824724106663a64e1237c01cec99ea5c503e92611fcceb32a1c10e85c59fee020a75e05748a8a82d89e08edaeb8f62a52843673dd59e5cfb4f6c4'
             '77a3849f4604fdb4293dbaf7341f9dab62b6e2df82eeab5baa728ed5ae9b3d0ac73f4fd924aee2271d6696ba5c26a50ff21f2a2a452515b8a4a2c12e9fd6a7e9'
-            'a1dab8ab925fc43522e93b3a661468b727d9b5da34d490d7768f464b48e0edf5b9ebc696c645755c87eccad84e9ae26e10e2a0362839fe426f3a6e3f1df5ea09')
+            '11407608510ea92b46a031e6bac459032ebefe4a66f192b2f3798e475e66a9f99bc33b48d930ca0736c496d52dffeb86b84937a960ad73ba91abcabb0b758778')
 
 export PBR_VERSION=$pkgver
 
@@ -215,23 +219,26 @@ _package_pkg(){
 		?*.service)install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i"
 	esac
 	done
-	install -Dm644 ${srcdir}/tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/$_pyname.conf
-	install -Dm644 ${srcdir}/sysusers.conf "$pkgdir"/usr/lib/sysusers.d/$_pyname.conf
+	install -vDm644 ${srcdir}/sudoers.conf "$pkgdir"/etc/sudoers.d/$_pyname
+	install -vDm644 ${srcdir}/tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/$_pyname.conf
+	install -vDm644 ${srcdir}/sysusers.conf "$pkgdir"/usr/lib/sysusers.d/$_pyname.conf
 	oslo-config-generator --config-file=etc/nova/nova-config-generator.conf
 	oslopolicy-sample-generator --config-file=etc/nova/nova-policy-generator.conf
-	install -Dm644 etc/$_pyname/rootwrap.conf -t "$CONFDIR"
-	install -Dm644 etc/$_pyname/rootwrap.conf -t "$DATADIR"
-	install -Dm644 etc/$_pyname/api-paste.ini -t "$CONFDIR"
-	install -Dm644 etc/$_pyname/api-paste.ini -t "$DATADIR"
-	install -Dm644 etc/$_pyname/logging_sample.conf -t "$CONFDIR"
-	install -Dm644 etc/$_pyname/logging_sample.conf -t "$DATADIR"
-	install -Dm644 etc/$_pyname/rootwrap.d/compute.filters -t "$CONFDIR/rootwrap.d"
-	install -Dm644 etc/$_pyname/*.*.sample -t "$CONFDIR"
-	install -Dm644 etc/$_pyname/*.*.sample -t "$DATADIR"
+	install -vDm644 etc/$_pyname/rootwrap.conf -t "$CONFDIR"
+	install -vDm644 etc/$_pyname/rootwrap.conf -t "$DATADIR"
+	install -vDm644 etc/$_pyname/api-paste.ini -t "$CONFDIR"
+	install -vDm644 etc/$_pyname/api-paste.ini -t "$DATADIR"
+	install -vDm644 etc/$_pyname/logging_sample.conf -t "$CONFDIR"
+	install -vDm644 etc/$_pyname/logging_sample.conf -t "$DATADIR"
+	install -vDm644 etc/$_pyname/rootwrap.d/compute.filters -t "$CONFDIR/rootwrap.d"
+	install -vDm644 etc/$_pyname/*.*.sample -t "$CONFDIR"
+	install -vDm644 etc/$_pyname/*.*.sample -t "$DATADIR"
 	echo '{}' >"$CONFDIR/policy.json"
 	for i in "$CONFDIR/"*.*.sample
 	do mv -v "$i" "${i//.sample}"
 	done
+	chmod 0750 $pkgdir/etc/sudoers.d
+	chmod 0440 $pkgdir/etc/sudoers.d/*
 }
 
 _package_doc(){
diff --git a/tmpfiles.conf b/tmpfiles.conf
index 71154dad7477..d9ca8c13caba 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -1,3 +1,3 @@
 d /var/log/nova 0750 nova nova -
 d /var/lib/nova 0750 nova nova -
-d /var/lib/nova/instances 0750 nova nova -
+d /var/lib/nova/instances 0770 nova nova -