Permalink
Browse files

Mass conversion of tabs and 8 spaces indents to 4 spaces indents.

  • Loading branch information...
1 parent 57baa0c commit 12464aa0c1d028d8bc0926b4ace8e07e62478dea root committed May 18, 2010
Showing with 6,111 additions and 6,111 deletions.
  1. +30 −30 aide/manifests/init.pp
  2. +3 −3 apache/manifests/classes/absent.pp
  3. +24 −24 apache/manifests/classes/backup.pp
  4. +4 −4 apache/manifests/classes/debian.pp
  5. +4 −4 apache/manifests/classes/disable.pp
  6. +3 −3 apache/manifests/classes/disableboot.pp
  7. +8 −8 apache/manifests/classes/firewall.pp
  8. +9 −9 apache/manifests/classes/modsecurity.pp
  9. +20 −20 apache/manifests/classes/monitor.pp
  10. +28 −28 apache/manifests/classes/php.pp
  11. +10 −10 apache/manifests/defines/conf.pp
  12. +36 −36 apache/manifests/defines/dotconf.pp
  13. +17 −17 apache/manifests/defines/php.pp
  14. +29 −29 apache/manifests/defines/virtualhost.pp
  15. +35 −35 apache/manifests/init.pp
  16. +25 −25 apache/manifests/params.pp
  17. +16 −16 audit/manifests/init.pp
  18. +21 −21 backup/manifests/init.pp
  19. +21 −21 backup/manifests/rsync.pp
  20. +88 −88 backup/manifests/rsyncssh.pp
  21. +117 −117 bind/manifests/init.pp
  22. +3 −3 cacti/manifests/classes/absent.pp
  23. +9 −9 cacti/manifests/classes/backup.pp
  24. +12 −12 cacti/manifests/classes/base.pp
  25. +8 −8 cacti/manifests/classes/firewall.pp
  26. +7 −7 cacti/manifests/classes/monitor.pp
  27. +14 −14 cacti/manifests/defines/conf.pp
  28. +9 −9 cacti/manifests/init.pp
  29. +63 −63 cactiold/manifests/init.pp
  30. +46 −46 certmaster/manifests/init.pp
  31. +3 −3 clamav/manifests/classes/absent.pp
  32. +18 −18 clamav/manifests/classes/backup.pp
  33. +4 −4 clamav/manifests/classes/disable.pp
  34. +3 −3 clamav/manifests/classes/disableboot.pp
  35. +18 −18 clamav/manifests/classes/firewall.pp
  36. +7 −7 clamav/manifests/classes/monitor.pp
  37. +22 −22 clamav/manifests/classes/server.pp
  38. +11 −11 clamav/manifests/defines/conf.pp
  39. +76 −76 clamav/manifests/defines/instance.pp
  40. +25 −25 clamav/manifests/init.pp
  41. +11 −11 clamav/manifests/params.pp
  42. +47 −47 cobbler/manifests/example42.pp
  43. +68 −68 cobbler/manifests/init.pp
  44. +38 −38 collectd/manifests/collection.pp
  45. +52 −52 collectd/manifests/init.pp
  46. +13 −13 collectd/manifests/plugin.pp
  47. +56 −56 common/manifests/defines/concatenated_file.pp
  48. +73 −73 common/manifests/defines/config.pp
  49. +25 −25 common/manifests/defines/config_file.pp
  50. +19 −19 common/manifests/defines/file2augeas.pp
  51. +29 −29 common/manifests/defines/line.pp
  52. +18 −18 common/manifests/defines/modules_dir.pp
  53. +12 −12 common/manifests/defines/modules_file.pp
  54. +40 −40 common/manifests/defines/netinstall.pp
  55. +14 −14 common/manifests/defines/replace.pp
  56. +8 −8 common/manifests/defines/replaceline.pp
  57. +8 −8 common/manifests/defines/replacelinepm.pp
  58. +8 −8 common/manifests/init.pp
  59. +21 −21 cron/manifests/base.pp
  60. +7 −7 cron/manifests/crontabs.pp
  61. +13 −13 cron/manifests/init.pp
  62. +46 −46 cups/manifests/init.pp
  63. +34 −34 dhcpd/manifests/init.pp
  64. +3 −3 dovecot/manifests/classes/absent.pp
  65. +8 −8 dovecot/manifests/classes/backup.pp
  66. +4 −4 dovecot/manifests/classes/debian.pp
  67. +4 −4 dovecot/manifests/classes/disable.pp
  68. +3 −3 dovecot/manifests/classes/disableboot.pp
  69. +36 −36 dovecot/manifests/classes/firewall.pp
  70. +36 −36 dovecot/manifests/classes/monitor.pp
  71. +11 −11 dovecot/manifests/classes/mysql.pp
  72. +11 −11 dovecot/manifests/defines/conf.pp
  73. +45 −45 dovecot/manifests/init.pp
  74. +4 −4 foreman/manifests/defines.pp
  75. +48 −48 func/manifests/base.pp
  76. +5 −5 func/manifests/init.pp
  77. +23 −23 hardening/manifests/eal4.pp
  78. +4 −4 hardening/manifests/init.pp
  79. +9 −9 hardening/manifests/logindefs.pp
  80. +14 −14 hardening/manifests/packages.pp
  81. +46 −46 hardening/manifests/services.pp
  82. +8 −8 hosts/manifests/init.pp
  83. +9 −9 iptables/manifests/disable.pp
  84. +5 −5 iptables/manifests/init.pp
  85. +19 −19 iptables/manifests/redhat.pp
  86. +32 −32 lighttpd/manifests/init.pp
  87. +6 −6 logrotate/manifests/init.pp
  88. +3 −3 mailscanner/manifests/classes/absent.pp
  89. +9 −9 mailscanner/manifests/classes/backup.pp
  90. +5 −5 mailscanner/manifests/classes/centos.pp
  91. +4 −4 mailscanner/manifests/classes/disable.pp
  92. +166 −166 mailscanner/manifests/classes/mailwatch.pp
  93. +7 −7 mailscanner/manifests/classes/monitor.pp
  94. +21 −21 mailscanner/manifests/classes/netinstall.pp
  95. +13 −13 mailscanner/manifests/classes/package.pp
  96. +36 −36 mailscanner/manifests/classes/postfix.pp
  97. +12 −12 mailscanner/manifests/defines/conf.pp
  98. +9 −9 mailscanner/manifests/defines/mailwatchconf.pp
  99. +18 −18 mailscanner/manifests/defines/mailwatchpmconf.pp
  100. +40 −40 mailscanner/manifests/init.pp
  101. +25 −25 mailscanner/manifests/params.pp
  102. +14 −14 monitor/manifests/collectd.pp
  103. +17 −17 monitor/manifests/defines/host.pp
  104. +10 −10 monitor/manifests/defines/plugin.pp
  105. +15 −15 monitor/manifests/defines/port.pp
  106. +14 −14 monitor/manifests/defines/process.pp
  107. +11 −11 monitor/manifests/defines/service.pp
  108. +13 −13 monitor/manifests/defines/url.pp
  109. +6 −6 monitor/manifests/init.pp
  110. +14 −14 monitor/manifests/munin.pp
  111. +70 −70 monitor/manifests/nagios.pp
  112. +27 −27 mrtg/manifests/init.pp
  113. +13 −13 munin/manifests/client.pp
  114. +14 −14 munin/manifests/client/base.pp
  115. +1 −1 munin/manifests/client/centos.pp
  116. +19 −19 munin/manifests/client/darwin.pp
  117. +9 −9 munin/manifests/client/debian.pp
  118. +1 −1 munin/manifests/client/gentoo.pp
  119. +24 −24 munin/manifests/client/openbsd.pp
  120. +5 −5 munin/manifests/client/package.pp
  121. +18 −18 munin/manifests/host.pp
  122. +9 −9 munin/manifests/host/cgi.pp
  123. +39 −39 munin/manifests/plugin.pp
  124. +18 −18 munin/manifests/plugin/deploy.pp
  125. +5 −5 munin/manifests/plugin/scriptpaths.pp
  126. +32 −32 munin/manifests/plugins/base.pp
  127. +1 −1 munin/manifests/plugins/gentoo.pp
  128. +12 −12 munin/manifests/plugins/interfaces.pp
  129. +4 −4 munin/manifests/plugins/linux.pp
  130. +8 −8 munin/manifests/plugins/nagios.pp
  131. +6 −6 munin/manifests/plugins/openbsd.pp
  132. +1 −1 munin/manifests/plugins/physical.pp
  133. +2 −2 munin/manifests/plugins/vserver.pp
  134. +11 −11 munin/manifests/register.pp
  135. +10 −10 munin/manifests/register_snmp.pp
  136. +13 −13 munin/manifests/remoteplugin.pp
  137. +11 −11 munin/manifests/snmp_collector.pp
  138. +3 −3 mysql/manifests/classes/absent.pp
  139. +9 −9 mysql/manifests/classes/backup.pp
  140. +4 −4 mysql/manifests/classes/disable.pp
  141. +3 −3 mysql/manifests/classes/disableboot.pp
  142. +9 −9 mysql/manifests/classes/firewall.pp
  143. +7 −7 mysql/manifests/classes/monitor.pp
  144. +11 −11 mysql/manifests/defines/conf.pp
  145. +21 −21 mysql/manifests/defines/grant.pp
  146. +23 −23 mysql/manifests/defines/query.pp
  147. +41 −41 mysql/manifests/init.pp
  148. +90 −90 nagios/manifests/base.pp
  149. +8 −8 nagios/manifests/centos.pp
  150. +23 −23 nagios/manifests/debian.pp
  151. +85 −85 nagios/manifests/defaults/commands.pp
  152. +3 −3 nagios/manifests/defaults/contactgroups.pp
  153. +9 −9 nagios/manifests/defaults/contacts.pp
  154. +16 −16 nagios/manifests/defaults/host_templates.pp
  155. +7 −7 nagios/manifests/defaults/hostgroups.pp
  156. +24 −24 nagios/manifests/defaults/service_templates.pp
  157. +9 −9 nagios/manifests/defaults/templates.pp
  158. +28 −28 nagios/manifests/defaults/timeperiods.pp
  159. +13 −13 nagios/manifests/init.pp
  160. +16 −16 nagios/manifests/munin.pp
  161. +2 −2 nagios/manifests/nsca/client.pp
  162. +2 −2 nagios/manifests/nsca/server.pp
  163. +15 −15 nagios/manifests/service.pp
  164. +19 −19 nagios/manifests/service/http.pp
  165. +23 −23 nagios/manifests/service/mysql.pp
  166. +2 −2 nagios/manifests/service/ntp.pp
  167. +6 −6 nagios/manifests/service/passive.pp
  168. +4 −4 nagios/manifests/service/ping.pp
  169. +4 −4 nagios/manifests/target.pp
  170. +9 −9 network/manifests/init.pp
  171. +41 −41 nfs/manifests/init.pp
  172. +24 −24 ntop/manifests/init.pp
  173. +55 −55 ntp/manifests/init.pp
  174. +25 −25 openvpn/manifests/init.pp
  175. +13 −13 oracle/manifests/classes/debian.pp
  176. +11 −11 oracle/manifests/classes/limits.pp
  177. +18 −18 oracle/manifests/classes/packages.pp
  178. +11 −11 oracle/manifests/classes/sysctl.pp
  179. +47 −47 oracle/manifests/classes/user.pp
  180. +10 −10 oracle/manifests/init.pp
  181. +8 −8 oracle/manifests/params.pp
  182. +90 −90 pam/manifests/init.pp
  183. +51 −51 phpsyslogng/manifests/init.pp
  184. +3 −3 postfix/manifests/classes/absent.pp
  185. +18 −18 postfix/manifests/classes/backup.pp
  186. +4 −4 postfix/manifests/classes/disable.pp
  187. +3 −3 postfix/manifests/classes/disableboot.pp
  188. +18 −18 postfix/manifests/classes/firewall.pp
  189. +18 −18 postfix/manifests/classes/monitor.pp
  190. +45 −45 postfix/manifests/classes/mysql-centos.pp
  191. +10 −10 postfix/manifests/classes/mysql-debian.pp
  192. +13 −13 postfix/manifests/classes/mysql-redhat.pp
  193. +57 −57 postfix/manifests/classes/mysql.pp
  194. +34 −34 postfix/manifests/classes/postfixadmin.pp
  195. +10 −10 postfix/manifests/defines/conf.pp
  196. +14 −14 postfix/manifests/defines/postfixadminconf.pp
  197. +30 −30 postfix/manifests/init.pp
  198. +8 −8 postfix/manifests/params.pp
  199. +38 −38 psad/manifests/base.pp
  200. +8 −8 psad/manifests/debian.pp
  201. +7 −7 psad/manifests/init.pp
  202. +31 −31 puppet/manifests/dashboard.pp
  203. +8 −8 puppet/manifests/foreman.pp
  204. +57 −57 puppet/manifests/init.pp
  205. +48 −48 puppet/manifests/master.pp
  206. +7 −7 rails/manifests/init.pp
  207. +72 −72 repo/manifests/init.pp
  208. +3 −3 repo/manifests/postfix.pp
  209. +9 −9 resolver/manifests/init.pp
  210. +27 −27 rip/manifests/init.pp
  211. +23 −23 rip/manifests/server.pp
  212. +6 −6 rootmail/manifests/init.pp
  213. +141 −141 rpmbuild/manifests/init.pp
  214. +46 −46 rsync/manifests/init.pp
  215. +54 −54 rsyslog/manifests/init.pp
  216. +52 −52 samba/manifests/init.pp
  217. +66 −66 samba/manifests/ldap.pp
  218. +24 −24 samba/manifests/pdc.pp
  219. +7 −7 sarg/manifests/init.pp
  220. +19 −19 selinux/manifests/init.pp
  221. +52 −52 sendmail/manifests/init.pp
  222. +48 −48 smolt/manifests/init.pp
  223. +30 −30 snmpd/manifests/init.pp
  224. +16 −16 spamassassin/manifests/init.pp
  225. +27 −27 sqlgrey/manifests/init.pp
  226. +109 −109 squid/manifests/init.pp
  227. +6 −6 squirrelmail/manifests/init.pp
  228. +49 −49 ssh/manifests/eal4.pp
  229. +54 −54 ssh/manifests/init.pp
  230. +32 −32 ssmtp/manifests/init.pp
  231. +41 −41 symbolic/manifests/init.pp
  232. +88 −88 synbak/manifests/init.pp
  233. +11 −11 sysctl/manifests/defines/conf.pp
  234. +10 −10 sysctl/manifests/init.pp
  235. +1 −1 sysctl/manifests/params.pp
  236. +43 −43 syslog-ng/manifests/init.pp
  237. +46 −46 syslog/manifests/base.pp
  238. +23 −23 syslog/manifests/central.pp
  239. +4 −4 syslog/manifests/disable.pp
  240. +8 −8 syslog/manifests/init.pp
  241. +6 −6 syslog/manifests/server.pp
  242. +14 −14 tftp/manifests/init.pp
  243. +32 −32 timezone/manifests/init.pp
  244. +24 −24 trac/manifests/init.pp
  245. +59 −59 trac/manifests/initenv.pp
  246. +10 −10 users/manifests/adduser.pp
  247. +6 −6 users/manifests/admin.pp
  248. +3 −3 users/manifests/deluser.pp
  249. +6 −6 users/manifests/example42.pp
  250. +3 −3 users/manifests/init.pp
  251. +16 −16 video-ati/manifests/init.pp
  252. +26 −26 vsftpd/manifests/init.pp
  253. +6 −6 webalizer/manifests/init.pp
  254. +87 −87 xen/manifests/init.pp
  255. +27 −27 xinetd/manifests/init.pp
  256. +203 −203 yum/manifests/init.pp
  257. +71 −71 yumreposerver/manifests/init.pp
View
@@ -1,37 +1,37 @@
class aide {
- package { aide:
- name => $operatingsystem ? {
- default => "aide",
- },
- ensure => present,
- }
+ package { aide:
+ name => $operatingsystem ? {
+ default => "aide",
+ },
+ ensure => present,
+ }
- file {
- "aide.conf":
-# mode => 600, owner => root, group => root,
- require => Package["aide"],
- ensure => present,
- path => $operatingsystem ?{
- freebsd => "/usr/local/etc/aide.conf",
- debian => "/etc/aide/aide.conf",
- ubuntu => "/etc/aide/aide.conf",
- default => "/etc/aide.conf",
- },
- }
+ file {
+ "aide.conf":
+# mode => 600, owner => root, group => root,
+ require => Package["aide"],
+ ensure => present,
+ path => $operatingsystem ?{
+ freebsd => "/usr/local/etc/aide.conf",
+ debian => "/etc/aide/aide.conf",
+ ubuntu => "/etc/aide/aide.conf",
+ default => "/etc/aide.conf",
+ },
+ }
# Cron job
-# file {
-# "aide.sh":
-# mode => 750,
-# owner => root, group => root,
-# require => File["aide.conf"],
-# ensure => present,
-# path => $operatingsystem ?{
-# default => "/etc/cron.daily/aide",
-# },
-# source => "puppet://$server/aide/aide.sh",
-# }
-
+# file {
+# "aide.sh":
+# mode => 750,
+# owner => root, group => root,
+# require => File["aide.conf"],
+# ensure => present,
+# path => $operatingsystem ?{
+# default => "/etc/cron.daily/aide",
+# },
+# source => "puppet://$server/aide/aide.sh",
+# }
+
}
@@ -6,7 +6,7 @@
# include apache::absent
#
class apache::absent inherits apache {
- Package["apache"] {
- ensure => "absent" ,
- }
+ Package["apache"] {
+ ensure => "absent" ,
+ }
}
@@ -8,29 +8,29 @@
#
class apache::backup {
- backup { "apache_data":
- frequency => daily,
- path => $operatingsystem ?{
- debian => "/var/www",
- ubuntu => "/var/www",
- suse => "/srv/www",
- default => "/var/www/html",
- },
- enabled => true,
- host => $fqdn,
- }
-
+ backup { "apache_data":
+ frequency => daily,
+ path => $operatingsystem ?{
+ debian => "/var/www",
+ ubuntu => "/var/www",
+ suse => "/srv/www",
+ default => "/var/www/html",
+ },
+ enabled => true,
+ host => $fqdn,
+ }
+
- backup { "apache_logs":
- frequency => daily,
- path => $operatingsystem ?{
- debian => "/var/log/apache2",
- ubuntu => "/var/log/apache2",
- suse => "/var/log/apache2",
- default => "/var/log/httpd",
- },
- enabled => false,
- host => $fqdn,
- }
-
+ backup { "apache_logs":
+ frequency => daily,
+ path => $operatingsystem ?{
+ debian => "/var/log/apache2",
+ ubuntu => "/var/log/apache2",
+ suse => "/var/log/apache2",
+ default => "/var/log/httpd",
+ },
+ enabled => false,
+ host => $fqdn,
+ }
+
}
@@ -6,8 +6,8 @@
class apache::debian {
# Quick'n'dirt fix for logs directory in apache::virtualhost base template
- file { "Apache_loglink":
- path => "/etc/apache2/logs",
- ensure => "/var/log/apache2/",
- }
+ file { "Apache_loglink":
+ path => "/etc/apache2/logs",
+ ensure => "/var/log/apache2/",
+ }
}
@@ -6,8 +6,8 @@
# include apache::disable
class apache::disable inherits apache {
- Service["apache"] {
- ensure => "stopped" ,
- enable => "false",
- }
+ Service["apache"] {
+ ensure => "stopped" ,
+ enable => "false",
+ }
}
@@ -7,7 +7,7 @@
# include apache::disableboot
#
class apache::disableboot inherits apache {
- Service["apache"] {
- enable => "false",
- }
+ Service["apache"] {
+ enable => "false",
+ }
}
@@ -11,13 +11,13 @@
#
class apache::firewall {
- firewall {
- "apache_port":
- source => "any",
- destination => $ipaddress,
- protocol => "tcp",
- port => 80,
- action => "allow",
- }
+ firewall {
+ "apache_port":
+ source => "any",
+ destination => $ipaddress,
+ protocol => "tcp",
+ port => 80,
+ action => "allow",
+ }
}
@@ -7,14 +7,14 @@
#
class apache::modsecurity {
- include apache
+ include apache
- package { mod_security:
- name => $operatingsystem ? {
- ubuntu => "mod-security-common",
- debian => "mod-security-common",
- default => "mod_security",
- },
- ensure => present,
- }
+ package { mod_security:
+ name => $operatingsystem ? {
+ ubuntu => "mod-security-common",
+ debian => "mod-security-common",
+ default => "mod_security",
+ },
+ ensure => present,
+ }
}
@@ -8,27 +8,27 @@
#
class apache::monitor {
- monitor::port {
- "apache_port":
- proto => "tcp",
- port => 80,
- enable => true,
- }
+ monitor::port {
+ "apache_port":
+ proto => "tcp",
+ port => 80,
+ enable => true,
+ }
- monitor::process {
- "apache_process":
- name => $operatingsystem ? {
- ubuntu => "apache2",
- debian => "apache2",
- default => "httpd",
- },
- enable => false,
- }
+ monitor::process {
+ "apache_process":
+ name => $operatingsystem ? {
+ ubuntu => "apache2",
+ debian => "apache2",
+ default => "httpd",
+ },
+ enable => false,
+ }
- monitor::plugin {
- "apache_plugin":
- name => "apache",
- enable => true,
- }
+ monitor::plugin {
+ "apache_plugin":
+ name => "apache",
+ enable => true,
+ }
}
@@ -8,27 +8,27 @@
#
class apache::php {
- include apache
-
- package { php:
- name => $operatingsystem ? {
- ubuntu => "php5",
- debian => "php5",
- suse => "php5",
- default => "php",
- },
- ensure => present,
- }
-
- package { php-common:
- name => $operatingsystem ? {
- ubuntu => "php5-common",
- debian => "php5-common",
- suse => undef,
- default => "php-common",
- },
- ensure => present,
- }
+ include apache
+
+ package { php:
+ name => $operatingsystem ? {
+ ubuntu => "php5",
+ debian => "php5",
+ suse => "php5",
+ default => "php",
+ },
+ ensure => present,
+ }
+
+ package { php-common:
+ name => $operatingsystem ? {
+ ubuntu => "php5-common",
+ debian => "php5-common",
+ suse => undef,
+ default => "php-common",
+ },
+ ensure => present,
+ }
}
@@ -42,14 +42,14 @@
class apache::php::pear {
- include apache::php
+ include apache::php
- package { php-pear:
- name => $operatingsystem ? {
- default => "php-pear",
- },
- ensure => present,
- }
+ package { php-pear:
+ name => $operatingsystem ? {
+ default => "php-pear",
+ },
+ ensure => present,
+ }
}
@@ -9,16 +9,16 @@
#
define apache::conf ($value) {
- require apache::params
+ require apache::params
- config { "apache_conf_$name":
- file => "${apache::params::configfile}",
- line => "$name $value",
- pattern => "$name ",
- engine => "replaceline",
- notify => Service["apache"],
- require => File["httpd.conf"],
- source => "apache::conf",
- }
+ config { "apache_conf_$name":
+ file => "${apache::params::configfile}",
+ line => "$name $value",
+ pattern => "$name ",
+ engine => "replaceline",
+ notify => Service["apache"],
+ require => File["httpd.conf"],
+ source => "apache::conf",
+ }
}
Oops, something went wrong.

0 comments on commit 12464aa

Please sign in to comment.