remove selinux relabel

This commit is contained in:
Emmanuel Garette 2021-11-28 17:04:15 +01:00
parent d41a879ed9
commit 8067baeb27
21 changed files with 3 additions and 42 deletions

View File

@ -40,12 +40,12 @@ IPAddressDeny=any
ROUGAIL_DEST = '/usr/local/lib' ROUGAIL_DEST = '/usr/local/lib'
ROUGAIL_GLOBAL_SYSTEMD_FILE = '/usr/lib/systemd/system' ROUGAIL_GLOBAL_SYSTEMD_FILE = '/usr/lib/systemd/system'
ROUGAIL_DEST_FILE = '/tmpfiles.d/0rougail.conf'
ROUGAIL_TMPL_TEMPLATE = f"""%def display(%%file, %%filename) ROUGAIL_TMPL_TEMPLATE = f"""%def display(%%file, %%filename)
%if %%filename.startswith('/etc/') or %%filename.startswith('/var/') or %%filename.startswith('/srv/') %if %%filename.startswith('/etc/') or %%filename.startswith('/var/') or %%filename.startswith('/srv/')
C %%filename %%file.mode %%file.owner %%file.group - {ROUGAIL_DEST}%%filename C %%filename %%file.mode %%file.owner %%file.group - {ROUGAIL_DEST}%%filename
z %%filename - - - - -
%end if %end if
%end def %end def
%for %%service in %%services %for %%service in %%services
@ -186,13 +186,12 @@ class RougailSystemdTemplate(RougailBaseTemplate):
self.ip_per_service = None self.ip_per_service = None
def post_instance(self): def post_instance(self):
destfile = '/tmpfiles.d/0rougail.conf' destfilename = join(self.destinations_dir, ROUGAIL_DEST_FILE[1:])
destfilename = join(self.destinations_dir, destfile[1:])
makedirs(dirname(destfilename), exist_ok=True) makedirs(dirname(destfilename), exist_ok=True)
self.log.info(_(f"creole processing: '{destfilename}'")) self.log.info(_(f"creole processing: '{destfilename}'"))
self.engines['creole'].process(filename=None, self.engines['creole'].process(filename=None,
source=ROUGAIL_TMPL_TEMPLATE, source=ROUGAIL_TMPL_TEMPLATE,
true_destfilename=destfile, true_destfilename=ROUGAIL_DEST_FILE,
destfilename=destfilename, destfilename=destfilename,
destdir=self.destinations_dir, destdir=self.destinations_dir,
variable=None, variable=None,

View File

@ -1,4 +1,2 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -
C /etc/file2 0644 root root - /usr/local/lib/etc/file2 C /etc/file2 0644 root root - /usr/local/lib/etc/file2
z /etc/file2 - - - - -

View File

@ -1,4 +1,2 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -
C /etc/file2 0644 root root - /usr/local/lib/etc/file2 C /etc/file2 0644 root root - /usr/local/lib/etc/file2
z /etc/file2 - - - - -

View File

@ -1,4 +1,2 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -
C /etc/file2 0644 root root - /usr/local/lib/etc/file2 C /etc/file2 0644 root root - /usr/local/lib/etc/file2
z /etc/file2 - - - - -

View File

@ -1,6 +1,3 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -
C /etc/file2 0644 root root - /usr/local/lib/etc/file2 C /etc/file2 0644 root root - /usr/local/lib/etc/file2
z /etc/file2 - - - - -
C /etc/dir/incfile 0644 root root - /usr/local/lib/etc/dir/incfile C /etc/dir/incfile 0644 root root - /usr/local/lib/etc/dir/incfile
z /etc/dir/incfile - - - - -

View File

@ -1,4 +1,2 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -
C /etc/file2 0644 root root - /usr/local/lib/etc/file2 C /etc/file2 0644 root root - /usr/local/lib/etc/file2
z /etc/file2 - - - - -

View File

@ -1,4 +1,2 @@
C /etc/systemd-makefs@dev-disk-by\x2dpartlabel 0644 root root - /usr/local/lib/etc/systemd-makefs@dev-disk-by\x2dpartlabel C /etc/systemd-makefs@dev-disk-by\x2dpartlabel 0644 root root - /usr/local/lib/etc/systemd-makefs@dev-disk-by\x2dpartlabel
z /etc/systemd-makefs@dev-disk-by\x2dpartlabel - - - - -
C /etc/systemd-makefs@dev-disk-by\x2dpartlabel2 0644 root root - /usr/local/lib/etc/systemd-makefs@dev-disk-by\x2dpartlabel2 C /etc/systemd-makefs@dev-disk-by\x2dpartlabel2 0644 root root - /usr/local/lib/etc/systemd-makefs@dev-disk-by\x2dpartlabel2
z /etc/systemd-makefs@dev-disk-by\x2dpartlabel2 - - - - -

View File

@ -1,2 +1 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -

View File

@ -1,2 +1 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -

View File

@ -1,2 +1 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -

View File

@ -1,2 +1 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -

View File

@ -1,4 +1,2 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -
C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2 C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
z /etc/mailname2 - - - - -

View File

@ -1,2 +1 @@
C /etc/file 0644 root root - /usr/local/lib/etc/file C /etc/file 0644 root root - /usr/local/lib/etc/file
z /etc/file - - - - -

View File

@ -1,4 +1,2 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -
C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2 C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
z /etc/mailname2 - - - - -

View File

@ -1,4 +1,2 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -
C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2 C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
z /etc/mailname2 - - - - -

View File

@ -1,4 +1,2 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -
C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2 C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
z /etc/mailname2 - - - - -

View File

@ -1,4 +1,2 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -
C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2 C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
z /etc/mailname2 - - - - -

View File

@ -1,2 +1 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -

View File

@ -1,8 +1,4 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -
C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2 C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
z /etc/mailname2 - - - - -
C /etc/mailname3 0644 root root - /usr/local/lib/etc/mailname3 C /etc/mailname3 0644 root root - /usr/local/lib/etc/mailname3
z /etc/mailname3 - - - - -
C /etc/mailname4 0644 root root - /usr/local/lib/etc/mailname4 C /etc/mailname4 0644 root root - /usr/local/lib/etc/mailname4
z /etc/mailname4 - - - - -

View File

@ -1,8 +1,4 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -
C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2 C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
z /etc/mailname2 - - - - -
C /etc/mailname3 0644 root root - /usr/local/lib/etc/mailname3 C /etc/mailname3 0644 root root - /usr/local/lib/etc/mailname3
z /etc/mailname3 - - - - -
C /etc/mailname4 0644 root root - /usr/local/lib/etc/mailname4 C /etc/mailname4 0644 root root - /usr/local/lib/etc/mailname4
z /etc/mailname4 - - - - -

View File

@ -1,2 +1 @@
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
z /etc/mailname - - - - -