Compare commits
2 Commits
d41a879ed9
...
703250c34f
Author | SHA1 | Date |
---|---|---|
Emmanuel Garette | 703250c34f | |
Emmanuel Garette | 8067baeb27 |
|
@ -40,12 +40,12 @@ IPAddressDeny=any
|
|||
|
||||
ROUGAIL_DEST = '/usr/local/lib'
|
||||
ROUGAIL_GLOBAL_SYSTEMD_FILE = '/usr/lib/systemd/system'
|
||||
ROUGAIL_DEST_FILE = '/tmpfiles.d/0rougail.conf'
|
||||
|
||||
|
||||
ROUGAIL_TMPL_TEMPLATE = f"""%def display(%%file, %%filename)
|
||||
%if %%filename.startswith('/etc/') or %%filename.startswith('/var/') or %%filename.startswith('/srv/')
|
||||
C %%filename %%file.mode %%file.owner %%file.group - {ROUGAIL_DEST}%%filename
|
||||
z %%filename - - - - -
|
||||
%end if
|
||||
%end def
|
||||
%for %%service in %%services
|
||||
|
@ -186,13 +186,12 @@ class RougailSystemdTemplate(RougailBaseTemplate):
|
|||
self.ip_per_service = None
|
||||
|
||||
def post_instance(self):
|
||||
destfile = '/tmpfiles.d/0rougail.conf'
|
||||
destfilename = join(self.destinations_dir, destfile[1:])
|
||||
destfilename = join(self.destinations_dir, ROUGAIL_DEST_FILE[1:])
|
||||
makedirs(dirname(destfilename), exist_ok=True)
|
||||
self.log.info(_(f"creole processing: '{destfilename}'"))
|
||||
self.engines['creole'].process(filename=None,
|
||||
source=ROUGAIL_TMPL_TEMPLATE,
|
||||
true_destfilename=destfile,
|
||||
true_destfilename=ROUGAIL_DEST_FILE,
|
||||
destfilename=destfilename,
|
||||
destdir=self.destinations_dir,
|
||||
variable=None,
|
||||
|
|
|
@ -61,19 +61,26 @@ class XMLReflector:
|
|||
|
||||
:param xmlfolders: list of full folder's name
|
||||
"""
|
||||
filenames = {}
|
||||
for xmlfolder in xmlfolders:
|
||||
filenames = [join(xmlfolder, filename) for filename in listdir(xmlfolder) if \
|
||||
filename.endswith('.xml')]
|
||||
filenames.sort()
|
||||
if not filenames:
|
||||
raise DictConsistencyError(_('there is no XML file'), 77, [xmlfolder])
|
||||
for xmlfile in filenames:
|
||||
try:
|
||||
document = parse(xmlfile)
|
||||
except XMLSyntaxError as err:
|
||||
raise DictConsistencyError(_(f'not a XML file: {err}'), 52, [xmlfile]) from err
|
||||
if not self.dtd.validate(document):
|
||||
dtd_error = self.dtd.error_log.filter_from_errors()[0]
|
||||
msg = _(f'not a valid XML file: {dtd_error}')
|
||||
raise DictConsistencyError(msg, 43, [xmlfile])
|
||||
yield xmlfile, document.getroot()
|
||||
for filename in listdir(xmlfolder):
|
||||
if not filename.endswith('.xml'):
|
||||
continue
|
||||
if filename in filenames:
|
||||
raise DictConsistencyError(_(f'duplicate xml file name {filename}'), 78, [xmlfolder])
|
||||
filenames[filename] = join(xmlfolder, filename)
|
||||
if not filenames:
|
||||
raise DictConsistencyError(_('there is no XML file'), 77, [xmlfolder])
|
||||
file_names = list(filenames.keys())
|
||||
file_names.sort()
|
||||
for filename in file_names:
|
||||
xmlfile = filenames[filename]
|
||||
try:
|
||||
document = parse(xmlfile)
|
||||
except XMLSyntaxError as err:
|
||||
raise DictConsistencyError(_(f'not a XML file: {err}'), 52, [xmlfile]) from err
|
||||
if not self.dtd.validate(document):
|
||||
dtd_error = self.dtd.error_log.filter_from_errors()[0]
|
||||
msg = _(f'not a valid XML file: {dtd_error}')
|
||||
raise DictConsistencyError(msg, 43, [xmlfile])
|
||||
yield xmlfile, document.getroot()
|
||||
|
|
|
@ -14,8 +14,8 @@ try:
|
|||
from tiramisu3 import *
|
||||
except:
|
||||
from tiramisu import *
|
||||
option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
|
||||
option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
|
||||
option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
|
||||
option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
|
||||
option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
|
||||
option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
|
||||
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/file2 - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/file2 - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/file2 - - - - -
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
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
|
||||
z /etc/file2 - - - - -
|
||||
C /etc/dir/incfile 0644 root root - /usr/local/lib/etc/dir/incfile
|
||||
z /etc/dir/incfile - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/file2 - - - - -
|
||||
|
|
|
@ -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
|
||||
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
|
||||
z /etc/systemd-makefs@dev-disk-by\x2dpartlabel2 - - - - -
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
C /etc/file 0644 root root - /usr/local/lib/etc/file
|
||||
z /etc/file - - - - -
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
C /etc/file 0644 root root - /usr/local/lib/etc/file
|
||||
z /etc/file - - - - -
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
C /etc/file 0644 root root - /usr/local/lib/etc/file
|
||||
z /etc/file - - - - -
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
|
||||
z /etc/mailname - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/mailname2 - - - - -
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
C /etc/file 0644 root root - /usr/local/lib/etc/file
|
||||
z /etc/file - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/mailname2 - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/mailname2 - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/mailname2 - - - - -
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
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
|
||||
z /etc/mailname2 - - - - -
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
|
||||
z /etc/mailname - - - - -
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
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
|
||||
z /etc/mailname2 - - - - -
|
||||
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
|
||||
z /etc/mailname4 - - - - -
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
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
|
||||
z /etc/mailname2 - - - - -
|
||||
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
|
||||
z /etc/mailname4 - - - - -
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
|
||||
z /etc/mailname - - - - -
|
||||
|
|
Loading…
Reference in New Issue