diff options
| -rw-r--r-- | cfengine/cf.groups.jones | 2 | ||||
| -rw-r--r-- | cfengine/cf.groups.merge | 2 | ||||
| -rw-r--r-- | cfengine/cf.groups.xenux | 2 | ||||
| -rw-r--r-- | cfengine/cf.services | 4 | ||||
| -rw-r--r-- | cfengine/cf.services.dhcp | 21 | ||||
| -rw-r--r-- | cfengine/cf.services.fai | 3 | ||||
| -rw-r--r-- | cfengine/cf.services.harden | 4 |
7 files changed, 38 insertions, 0 deletions
diff --git a/cfengine/cf.groups.jones b/cfengine/cf.groups.jones index b2f53b5..ee55a1b 100644 --- a/cfengine/cf.groups.jones +++ b/cfengine/cf.groups.jones @@ -18,6 +18,8 @@ groups: # CVSServer_jones = ( ) # GMServer_jones = ( ) # CDWriter_jones = ( ) +# DHCPServer_jones = ( ) +# FAIServer_jones = ( ) IMAPServer_jones = ( auryn fuchur bastian slamuf pierre ror rornaestved nimbus woody ) MailHub_jones = ( bastian jawa ) MailClient_jones = ( auryn fuchur bastian slamuf pierre ror wetware honda jawa woody mail2 ) diff --git a/cfengine/cf.groups.merge b/cfengine/cf.groups.merge index b38a489..449e8dc 100644 --- a/cfengine/cf.groups.merge +++ b/cfengine/cf.groups.merge @@ -16,6 +16,8 @@ groups: CVSServer = ( CVSServer_jones CVSServer_xenux ) GMServer = ( GMServer_jones GMServer_xenux ) CDWriter = ( CDWriter_jones CDWriter_xenux ) + DHCPServer = ( DHCPServer_jones DHCPServer_xenux ) + FAIServer = ( FAIServer_jones FAIServer_xenux ) IMAPServer = ( IMAPServer_jones IMAPServer_xenux ) MailHub = ( MailHub_jones MailHub_xenux ) MailClient = ( MailClient_jones MailClient_xenux ) diff --git a/cfengine/cf.groups.xenux b/cfengine/cf.groups.xenux index 1415d3e..e103854 100644 --- a/cfengine/cf.groups.xenux +++ b/cfengine/cf.groups.xenux @@ -17,6 +17,8 @@ groups: Firewall_xenux = ( orcrist mogl-firewall aries debian-grinsted ) CVSServer_xenux = ( bilbo ) GMServer_xenux = ( bilbo ) + DHCPServer_xenux = ( orcrist ) + FAIServer_xenux = ( thorin ) CDWriter_xenux = ( bilbo ) IMAPServer_xenux = ( oin ) MailHub_xenux = ( oin ) diff --git a/cfengine/cf.services b/cfengine/cf.services index 230354a..adcbd11 100644 --- a/cfengine/cf.services +++ b/cfengine/cf.services @@ -7,5 +7,9 @@ import: $(cfroot)/cf.services.ftp WWWServer:: $(cfroot)/cf.services.web +# DHCPServer:: +# $(cfroot)/cf.services.web +# FAIServer:: +# $(cfroot)/cf.services.web any:: $(cfroot)/cf.services.harden diff --git a/cfengine/cf.services.dhcp b/cfengine/cf.services.dhcp new file mode 100644 index 0000000..88a6f13 --- /dev/null +++ b/cfengine/cf.services.dhcp @@ -0,0 +1,21 @@ +control: + AddInstallable = ( dhcpd_reload ) + +editfiles: + { /etc/dhcp.conf + # + # We don't make the dhcp.conf dynamically, but instead we copy the contents + # of a master file, but only if it's newer than the one installed. + # + BeginGroupIfFileIsNewer "/etc/local-COMMON/dhcpd.conf.$(site)" + AutoCreate + EmptyEntireFilePlease + InsertFile "/etc/local-COMMON/dhcp.conf.$(site)" + Append "# Edited by cfengine $(date)" + EndGroup + DefineClasses "dhcpd_reload" + } + +shellcommands: + dhcpd_reload:: + "/etc/init.d/dhcp force-reload" diff --git a/cfengine/cf.services.fai b/cfengine/cf.services.fai new file mode 100644 index 0000000..ae7e7b2 --- /dev/null +++ b/cfengine/cf.services.fai @@ -0,0 +1,3 @@ +editfiles: + { /etc/fai.conf + } diff --git a/cfengine/cf.services.harden b/cfengine/cf.services.harden index d1f3944..7f29992 100644 --- a/cfengine/cf.services.harden +++ b/cfengine/cf.services.harden @@ -1,4 +1,5 @@ editfiles: + # AIDE section { /etc/aide/aide.conf # # Logs = p+n+u+g @@ -68,3 +69,6 @@ editfiles: InsertLine "!/dev/ttyS* # Added by cfengine" EndGroup } + ## logcheck section + #{ /etc/aide/aide.conf + #} |