[augeas-devel] augeas: master - Whitespace cleanup (no functional change)
David Lutterkort
lutter at fedoraproject.org
Fri May 29 19:23:06 UTC 2009
Gitweb: http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=69bd7421486b237e88462e898845015dfd1e0135
Commit: 69bd7421486b237e88462e898845015dfd1e0135
Parent: bccf692ec237528050cd5d6fe62b3ae7b913a0b4
Author: David Lutterkort <lutter at redhat.com>
AuthorDate: Fri May 29 12:21:10 2009 -0700
Committer: David Lutterkort <lutter at redhat.com>
CommitterDate: Fri May 29 12:21:10 2009 -0700
Whitespace cleanup (no functional change)
Remove trailing whitespace
---
lenses/bbhosts.aug | 12 ++++----
lenses/dhclient.aug | 2 +-
lenses/dput.aug | 8 +++---
lenses/exports.aug | 2 +-
lenses/fstab.aug | 4 +-
lenses/inifile.aug | 12 ++++----
lenses/logrotate.aug | 10 +++---
lenses/openvpn.aug | 2 +-
lenses/pam.aug | 2 +-
lenses/samba.aug | 6 ++--
lenses/shellvars.aug | 16 ++++++------
lenses/slapd.aug | 4 +-
lenses/sshd.aug | 16 ++++++------
lenses/sysctl.aug | 2 +-
lenses/tests/test_aliases.aug | 2 +-
lenses/tests/test_aptpreferences.aug | 6 ++--
lenses/tests/test_bbhosts.aug | 8 +++---
lenses/tests/test_dhclient.aug | 24 +++++++++---------
lenses/tests/test_dput.aug | 10 +++---
lenses/tests/test_exports.aug | 2 +-
lenses/tests/test_fstab.aug | 14 +++++-----
lenses/tests/test_gdm.aug | 2 +-
lenses/tests/test_hosts.aug | 6 ++--
lenses/tests/test_inifile.aug | 20 +++++++-------
lenses/tests/test_interfaces.aug | 4 +-
lenses/tests/test_logrotate.aug | 8 +++---
lenses/tests/test_monit.aug | 2 +-
lenses/tests/test_ntp.aug | 12 ++++----
lenses/tests/test_pam.aug | 4 +-
lenses/tests/test_php.aug | 4 +-
lenses/tests/test_postfix_master.aug | 4 +-
lenses/tests/test_samba.aug | 4 +-
lenses/tests/test_shellvars.aug | 16 ++++++------
lenses/tests/test_spacevars.aug | 4 +-
lenses/tests/test_squid.aug | 4 +-
lenses/tests/test_sshd.aug | 2 +-
lenses/tests/test_vsftpd.aug | 2 +-
lenses/tests/test_yum.aug | 2 +-
lenses/util.aug | 6 ++--
lenses/xinetd.aug | 46 +++++++++++++++++-----------------
40 files changed, 158 insertions(+), 158 deletions(-)
diff --git a/lenses/bbhosts.aug b/lenses/bbhosts.aug
index 6515d03..a098cf7 100644
--- a/lenses/bbhosts.aug
+++ b/lenses/bbhosts.aug
@@ -6,7 +6,7 @@
(* Todo : *)
(* *)
-module BBhosts =
+module BBhosts =
autoload xfm
(* Define useful shortcuts *)
@@ -29,8 +29,8 @@ module BBhosts =
let host_fqdn = [ label "fqdn" . sep_spc . word ]
let host_test_url = [ label "url" . sep_spc . url ]
- let host_test_cont (kw:string) = [ sep_spc . store /!?/ . key kw .
- (Util.del_str ";" .
+ let host_test_cont (kw:string) = [ sep_spc . store /!?/ . key kw .
+ (Util.del_str ";" .
[ label "url" . word ] .
(Util.del_str ";" . [ label "keyword" . word ])?
)?
@@ -53,7 +53,7 @@ module BBhosts =
| host_test_flag "BBNET"
| host_test_flag "BBPAGER"
| host_test_url
-
+
let host_opts = [ label "probes" . sep_spc . Util.del_str "#" . host_test* ]
@@ -61,7 +61,7 @@ module BBhosts =
(* Define group-compress and group-only *)
let group_compress = [ key "group-compress" . sep_spc . value_to_eol . eol_no_spc .
- ( comment | empty | host)*
+ ( comment | empty | host)*
]
let group_only_col = [ label "col" . word ]
@@ -70,7 +70,7 @@ module BBhosts =
( comment | empty | host)*
]
-
+
(* Define page *)
let page_title = [ label "title" . sep_spc . value_to_eol . eol_no_spc ]
let page = [ key "page" . sep_spc . word . page_title .
diff --git a/lenses/dhclient.aug b/lenses/dhclient.aug
index dbfc797..b58f0b6 100644
--- a/lenses/dhclient.aug
+++ b/lenses/dhclient.aug
@@ -134,7 +134,7 @@ let stmt_block_date = [ key stmt_block_date_re
let stmt_block_arg = sep_spc . sto_to_spc
-let stmt_block_entry = sep_spc
+let stmt_block_entry = sep_spc
. ( stmt_array
| stmt_hash
| stmt_block_opt
diff --git a/lenses/dput.aug b/lenses/dput.aug
index 56b2983..0eb6cc8 100644
--- a/lenses/dput.aug
+++ b/lenses/dput.aug
@@ -1,5 +1,5 @@
-(* Dput module for Augeas
- Author: Raphael Pinson <raphink at gmail.com>
+(* Dput module for Augeas
+ Author: Raphael Pinson <raphink at gmail.com>
Reference: dput uses Python's ConfigParser:
@@ -44,7 +44,7 @@ let setting = "allow_non-us_software"
* "name=value" is also accepted
* leading whitespace is removed from values
*************************************************************************)
-let entry = IniFile.entry setting sep comment
+let entry = IniFile.entry setting sep comment
(************************************************************************
@@ -56,7 +56,7 @@ let entry = IniFile.entry setting sep comment
* because augeas doesn't like '/' keys (although it is legal in INI Files)
*************************************************************************)
let title = IniFile.title_label "target" IniFile.record_label_re
-let record = IniFile.record title entry
+let record = IniFile.record title entry
let lns = IniFile.lns record comment
diff --git a/lenses/exports.aug b/lenses/exports.aug
index e666d77..c4fda27 100644
--- a/lenses/exports.aug
+++ b/lenses/exports.aug
@@ -83,7 +83,7 @@ module Exports =
let rbracket = Util.del_str ")"
let sep_com = Sep.comma
let sep_spc = Sep.space
-
+
let option = [ label "option" . store /[^,)]+/ ]
let client = [ label "client" . store client_re .
diff --git a/lenses/fstab.aug b/lenses/fstab.aug
index 031f570..2da16ee 100644
--- a/lenses/fstab.aug
+++ b/lenses/fstab.aug
@@ -9,7 +9,7 @@ module Fstab =
let eol = Util.eol
let comment = Util.comment
- let empty = Util.empty
+ let empty = Util.empty
let word = Rx.neg1
@@ -17,7 +17,7 @@ module Fstab =
let lns = [ label l . store word ] in
Build.opt_list lns comma
- let record = [ seq "mntent" .
+ let record = [ seq "mntent" .
[ label "spec" . store word ] . sep_tab .
[ label "file" . store word ] . sep_tab .
comma_sep_list "vfstype" . sep_tab .
diff --git a/lenses/inifile.aug b/lenses/inifile.aug
index 30f5233..04e8af2 100644
--- a/lenses/inifile.aug
+++ b/lenses/inifile.aug
@@ -2,7 +2,7 @@
Module: IniFile
Generic module to create INI files lenses
-Author: Raphael Pinson <raphink at gmail.com>
+Author: Raphael Pinson <raphink at gmail.com>
About: License
This file is licensed under the GPL.
@@ -48,11 +48,11 @@ let empty = [ eol ]
Variable: sep
Generic separator
- Parameters:
+ Parameters:
pat:regexp - the pattern to delete
default:string - the default string to use
*)
-let sep (pat:regexp) (default:string)
+let sep (pat:regexp) (default:string)
= Util.del_opt_ws "" . del pat default
(*
@@ -168,7 +168,7 @@ let entry_re = ( /[A-Za-z][A-Za-z0-9\._-]+/ )
(************************************************************************
- * Group: RECORD
+ * Group: RECORD
*************************************************************************)
(* Group: Title definition *)
@@ -222,7 +222,7 @@ let title_label (name:string) (kw:regexp)
Variable: record_re
Default regexp for <title> keyword pattern
*)
-let record_re = ( /[^]\n\/]+/ - /#comment/ )
+let record_re = ( /[^]\n\/]+/ - /#comment/ )
(*
Variable: record_label_re
@@ -285,7 +285,7 @@ let lns_noempty (record:lens) (comment:lens)
(*
View: lns
Generic INI File lens
-
+
Parameters:
record:lens - record lens to use. See <record>.
comment:lens - comment lens to use. See <comment>.
diff --git a/lenses/logrotate.aug b/lenses/logrotate.aug
index c3409a0..d773a9f 100644
--- a/lenses/logrotate.aug
+++ b/lenses/logrotate.aug
@@ -11,7 +11,7 @@
(* Todo : *)
(* *)
-module Logrotate =
+module Logrotate =
autoload xfm
let sep_spc = Util.del_ws_spc
@@ -81,8 +81,8 @@ module Logrotate =
(* Define hooks *)
- let hook_lines = store ( ( /.*/ . "\n") - /[ \t]*endscript[ \t]*\n/ )*
-
+ let hook_lines = store ( ( /.*/ . "\n") - /[ \t]*endscript[ \t]*\n/ )*
+
let hook_func (func_type:string) = [
del /[ \t]*/ "\t" . key func_type . eol .
hook_lines .
@@ -99,8 +99,8 @@ module Logrotate =
. ( comment "\t" | attrs "\t" | hooks | empty )*
. del /[ \t]*\}[ \t]*\n/ "}\n"
- let rule =
- [ label "rule" .
+ let rule =
+ [ label "rule" .
[ label "file" . store word ] .
[ del /[ \t]+/ " " . label "file" . store word ]* .
del /[ \t\n]*/ " " . body ]
diff --git a/lenses/openvpn.aug b/lenses/openvpn.aug
index 567abb5..28cd046 100644
--- a/lenses/openvpn.aug
+++ b/lenses/openvpn.aug
@@ -126,7 +126,7 @@ let flag_words = "client-to-client"
| "mute-replay-warnings"
| "http-proxy-retry"
-let flag_entry (kw:regexp)
+let flag_entry (kw:regexp)
= [ key kw . (eol|comment) ]
let flag = flag_entry flag_words
diff --git a/lenses/pam.aug b/lenses/pam.aug
index 76a99ff..ff1726a 100644
--- a/lenses/pam.aug
+++ b/lenses/pam.aug
@@ -23,7 +23,7 @@ module Pam =
(* Not mentioned in the man page, but Debian uses the syntax *)
(* @include module *)
(* quite a bit *)
- let include = [ indent . Util.del_str "@" . key "include" .
+ let include = [ indent . Util.del_str "@" . key "include" .
Util.del_ws_spc . store word . eol ]
let record = [ seq "record" . indent .
diff --git a/lenses/samba.aug b/lenses/samba.aug
index 467e560..4b303f6 100644
--- a/lenses/samba.aug
+++ b/lenses/samba.aug
@@ -1,4 +1,4 @@
-(* Samba module for Augeas
+(* Samba module for Augeas
Author: Free Ekanayaka <free at 64studio.com>
Reference: man smb.conf(5)
@@ -20,7 +20,7 @@ let indent = del /[ \t]*/ " "
(* Import useful INI File primitives *)
let eol = IniFile.eol
let empty = IniFile.empty
-let sto_to_comment
+let sto_to_comment
= Util.del_opt_ws " "
. store /[^;# \t\n][^;#\n]*[^;# \t\n]|[^;# \t\n]/
@@ -43,7 +43,7 @@ let entry = let kw = entry_re in
*************************************************************************)
let title = IniFile.title_label "target" IniFile.record_label_re
-let record = IniFile.record title entry
+let record = IniFile.record title entry
(************************************************************************
* LENS & FILTER
diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
index d3e4bbe..845c8eb 100644
--- a/lenses/shellvars.aug
+++ b/lenses/shellvars.aug
@@ -10,7 +10,7 @@ module Shellvars =
let comment = Util.comment
let empty = Util.empty
- let char = /[^() '"\t\n]|\\\\"/
+ let char = /[^() '"\t\n]|\\\\"/
let dquot = /"([^"\\\n]|\\\\.)*"/ (* " Emacs, relax *)
let squot = /'[^'\n]*'/
@@ -23,10 +23,10 @@ module Shellvars =
[ seq "values" . array_value ] .
[ del /[ \t]+/ " " . seq "values" . array_value ] *
. del ")" ")"
-
+
(* Treat an empty list () as a value '()'; that's not quite correct *)
(* but fairly close. *)
- let simple_value =
+ let simple_value =
let empty_array = /\([ \t]*\)/ in
store (char* | dquot | squot | empty_array)
@@ -35,16 +35,16 @@ module Shellvars =
let unset = [ key "unset" . Util.del_ws_spc . store key_re . eol ]
- let source =
- [
- del /\.|source/ "." . label ".source" .
- Util.del_ws_spc . store /[^= \t\n]+/ . eol
+ let source =
+ [
+ del /\.|source/ "." . label ".source" .
+ Util.del_ws_spc . store /[^= \t\n]+/ . eol
]
let lns = (comment | empty | source | kv | unset) *
let sc_incl (n:string) = (incl ("/etc/sysconfig/" . n))
- let filter_sysconfig =
+ let filter_sysconfig =
sc_incl "atd" .
sc_incl "authconfig" .
sc_incl "autofs" .
diff --git a/lenses/slapd.aug b/lenses/slapd.aug
index 598b431..63456ca 100644
--- a/lenses/slapd.aug
+++ b/lenses/slapd.aug
@@ -31,7 +31,7 @@ let what = [ spc . label "what" . sto_to_spc ]
(* TODO: parse the control field, see man slapd.access (5) *)
let control = [ spc . label "control" . sto_to_by ]
let by = [ sep . key "by". who . what. control? ]
-
+
let access = [ key access_re . spc. sto_to_spc . by+ . eol ]
(************************************************************************
@@ -96,7 +96,7 @@ let global_re = "allow"
| "TLSVerifyClient"
| "TLSCRLCheck"
| "backend"
-
+
let global = Spacevars.entry global_re
(************************************************************************
diff --git a/lenses/sshd.aug b/lenses/sshd.aug
index 6f4204b..826d416 100644
--- a/lenses/sshd.aug
+++ b/lenses/sshd.aug
@@ -70,7 +70,7 @@ module Sshd =
let sep = Util.del_ws_spc
- let key_re = /[A-Za-z0-9]+/
+ let key_re = /[A-Za-z0-9]+/
- /MACs|Match|AcceptEnv|Subsystem|(Allow|Deny)(Groups|Users)/
let comment = Util.comment
@@ -91,13 +91,13 @@ module Sshd =
let deny_groups = array_entry "DenyGroups"
let deny_users = array_entry "DenyUsers"
- let subsystemvalue =
+ let subsystemvalue =
let value = store /[^ \t\n]+/ in
- [ key /[A-Za-z0-9]+/ . sep . value . eol ]
+ [ key /[A-Za-z0-9]+/ . sep . value . eol ]
- let subsystem =
+ let subsystem =
let value = store /[^ \t\n]+([ \t]+[^ \t\n]+)*/ in
- [ key "Subsystem" . sep . subsystemvalue ]
+ [ key "Subsystem" . sep . subsystemvalue ]
let macs =
let mac_value = store /[^, \t\n]+/ in
@@ -110,10 +110,10 @@ module Sshd =
let value = store /[^ \t\n]+/ in
[ sep . key /[A-Za-z0-9]+/ . sep . value ]
- let match_cond =
+ let match_cond =
[ label "Condition" . condition_entry+ . eol ]
- let match_entry =
+ let match_entry =
( comment | empty | (Util.indent . other_entry) )
let match =
@@ -122,7 +122,7 @@ module Sshd =
]
let lns = (comment | empty | accept_env | allow_groups | allow_users
- | deny_groups | subsystem | deny_users | macs
+ | deny_groups | subsystem | deny_users | macs
| other_entry ) * . match*
let xfm = transform lns (incl "/etc/ssh/sshd_config")
diff --git a/lenses/sysctl.aug b/lenses/sysctl.aug
index 749af81..5b33f65 100644
--- a/lenses/sysctl.aug
+++ b/lenses/sysctl.aug
@@ -9,7 +9,7 @@ module Sysctl =
let eq = del /[ \t]*=[ \t]*/ " = "
let value_re = /[^ \t\n](.*[^ \t\n])?/
- let comment = [ indent . label "#comment" . del /[#;][ \t]*/ "# "
+ let comment = [ indent . label "#comment" . del /[#;][ \t]*/ "# "
. store /([^ \t\n].*[^ \t\n]|[^ \t\n])/ . eol ]
let empty = Util.empty
diff --git a/lenses/tests/test_aliases.aug b/lenses/tests/test_aliases.aug
index d052847..4041f8a 100644
--- a/lenses/tests/test_aliases.aug
+++ b/lenses/tests/test_aliases.aug
@@ -58,7 +58,7 @@ bin: root, ruth
(* Don't have to have whitespace after a comma *)
let nocomma = "alias: target1,target2\n"
- test Aliases.lns get nocomma =
+ test Aliases.lns get nocomma =
{ "1"
{ "name" = "alias" }
{ "value" = "target1" }
diff --git a/lenses/tests/test_aptpreferences.aug b/lenses/tests/test_aptpreferences.aug
index 783e16e..307610f 100644
--- a/lenses/tests/test_aptpreferences.aug
+++ b/lenses/tests/test_aptpreferences.aug
@@ -1,4 +1,4 @@
-module Test_aptpreferences =
+module Test_aptpreferences =
let conf ="Explanation: Backport packages are never prioritary
Package: *
@@ -11,7 +11,7 @@ Pin: release l=Raphink, v=3.0
Pin-Priority: 700
"
- test AptPreferences.lns get conf =
+ test AptPreferences.lns get conf =
{ "1"
{ "Explanation" = "Backport packages are never prioritary" }
{ "Package" = "*" }
@@ -26,4 +26,4 @@ Pin-Priority: 700
{ "l" = "Raphink" }
{ "v" = "3.0" } }
{ "Pin-Priority" = "700" } }
-
+
diff --git a/lenses/tests/test_bbhosts.aug b/lenses/tests/test_bbhosts.aug
index b76f775..b00e3ed 100644
--- a/lenses/tests/test_bbhosts.aug
+++ b/lenses/tests/test_bbhosts.aug
@@ -1,4 +1,4 @@
-module Test_bbhosts =
+module Test_bbhosts =
let conf = "
# A comment
@@ -24,7 +24,7 @@ group-compress My test
192.168.0.3 myhost2 # !imap2 telnet dns
"
- test BBhosts.lns get conf =
+ test BBhosts.lns get conf =
{}
{ "#comment" = "A comment" }
{}
@@ -35,7 +35,7 @@ group-compress My test
{ "host"
{ "ip" = "1.2.3.4" }
{ "fqdn" = "amachine" }
- { "probes"
+ { "probes"
{ "url" = "http://url.to/monitor" }
{ "url" = "https://another.url/to/monitor" }
{ "cont" = ""
@@ -44,7 +44,7 @@ group-compress My test
{ "host"
{ "ip" = "1.2.3.5" }
{ "fqdn" = "amachine2" }
- { "probes"
+ { "probes"
{ "url" = "http://url.to/monitor" }
{ "url" = "https://another.url/to/monitor" }
{ "cont" = "!"
diff --git a/lenses/tests/test_dhclient.aug b/lenses/tests/test_dhclient.aug
index 98579a1..d914128 100644
--- a/lenses/tests/test_dhclient.aug
+++ b/lenses/tests/test_dhclient.aug
@@ -1,18 +1,18 @@
-module Test_dhclient =
+module Test_dhclient =
let conf =" # Sample dhclient.conf
# Protocol timing
timeout 3; # Expect a fast server
-retry
+retry
10;
# Lease requirements and requests
request
- subnet-mask,
+ subnet-mask,
broadcast-address,
ntp-servers;
# Dynamic DNS
send
- fqdn.fqdn
+ fqdn.fqdn
\"grosse.fugue.com.\";
interface ep0 {
@@ -53,21 +53,21 @@ lease {
{ "#comment" = "Expect a fast server" } }
{ "retry" = "10" }
{ "#comment" = "Lease requirements and requests" }
- { "request"
+ { "request"
{ "1" = "subnet-mask" }
{ "2" = "broadcast-address" }
{ "3" = "ntp-servers" } }
{ "#comment" = "Dynamic DNS" }
- { "send"
+ { "send"
{ "fqdn.fqdn" = "\"grosse.fugue.com.\"" } }
{}
{ "interface" = "ep0"
{ "script" = "/sbin/dhclient-script" }
- { "send"
- { "dhcp-client-identifier" = "1:0:a0:24:ab:fb:9c" } }
- { "send"
- { "dhcp-lease-time" = "3600" } }
- { "request"
+ { "send"
+ { "dhcp-client-identifier" = "1:0:a0:24:ab:fb:9c" } }
+ { "send"
+ { "dhcp-lease-time" = "3600" } }
+ { "request"
{ "1" = "subnet-mask" }
{ "2" = "broadcast-address" }
{ "3" = "time-offset" }
@@ -75,7 +75,7 @@ lease {
{ "5" = "domain-name" }
{ "6" = "domain-name-servers" }
{ "7" = "host-name" } }
- { "media"
+ { "media"
{ "1" = "media10baseT/UTP" }
{ "2" = "\"media10base2/BNC\"" } } }
{}
diff --git a/lenses/tests/test_dput.aug b/lenses/tests/test_dput.aug
index 44249b9..2e72ce1 100644
--- a/lenses/tests/test_dput.aug
+++ b/lenses/tests/test_dput.aug
@@ -57,7 +57,7 @@ post_upload_command = /usr/bin/mini-dinstall --batch
"
- test Dput.lns get conf =
+ test Dput.lns get conf =
{ "#comment" = "Example dput.cf that defines the host that can be used" }
{ "#comment" = "with dput for uploading." }
{}
@@ -77,21 +77,21 @@ post_upload_command = /usr/bin/mini-dinstall --batch
{ "default_host_main" = "hebex" }
{ "allowed_distributions" = "(?!UNRELEASED)" }
{} }
- { "target" = "hebex"
+ { "target" = "hebex"
{ "fqdn" = "condor.infra.s1.p.fti.net" }
{ "login" = "anonymous" }
{ "method" = "ftp" }
{ "incoming" = "/incoming/hebex" }
{ "passive_ftp" = "0" }
{} }
- { "target" = "dop/desktop"
+ { "target" = "dop/desktop"
{ "fqdn" = "condor.infra.s1.p.fti.net" }
{ "login" = "anonymous" }
{ "method" = "ftp" }
{ "incoming" = "/incoming/dop/desktop" }
{ "passive_ftp" = "0" }
{} }
- { "target" = "jp-non-us"
+ { "target" = "jp-non-us"
{ "fqdn" = "hp.debian.or.jp" }
{ "incoming" = "/pub/Incoming/upload-non-US" }
{ "login" = "anonymous" }
@@ -102,7 +102,7 @@ post_upload_command = /usr/bin/mini-dinstall --batch
{ "#comment" = "incoming = /public/pub/Linux/debian/UploadQueue/" }
{ "#comment" = "login = anonymous" }
{} }
- { "target" = "ftp-master"
+ { "target" = "ftp-master"
{ "fqdn" = "ftp-master.debian.org" }
{ "incoming" = "/pub/UploadQueue/" }
{ "login" = "anonymous" }
diff --git a/lenses/tests/test_exports.aug b/lenses/tests/test_exports.aug
index 680c46d..adc096a 100644
--- a/lenses/tests/test_exports.aug
+++ b/lenses/tests/test_exports.aug
@@ -6,7 +6,7 @@ module Test_exports =
# Yes, we export /tmp
/tmp 172.31.0.0/16(rw,root_squash,sync)\n"
- test Exports.lns get s =
+ test Exports.lns get s =
{ "dir" = "/local"
{ "client" = "172.31.0.0/16"
{ "option" = "rw" }
diff --git a/lenses/tests/test_fstab.aug b/lenses/tests/test_fstab.aug
index 0688af6..1235fc5 100644
--- a/lenses/tests/test_fstab.aug
+++ b/lenses/tests/test_fstab.aug
@@ -2,7 +2,7 @@ module Test_fstab =
let simple = "/dev/vg00/lv00\t /\t ext3\t defaults 1 1\n"
- let simple_tree =
+ let simple_tree =
{ "1"
{ "spec" = "/dev/vg00/lv00" }
{ "file" = "/" }
@@ -13,11 +13,11 @@ module Test_fstab =
let trailing_ws = "/dev/vg00/lv00\t /\t ext3\t defaults 1 1 \t\n"
- let gen_no_passno(passno:string) =
+ let gen_no_passno(passno:string) =
"LABEL=/boot\t /boot\t ext3\t defaults 1" . passno . " \t\n"
let no_passno = gen_no_passno ""
- let no_passno_tree =
+ let no_passno_tree =
{ "1"
{ "spec" = "LABEL=/boot" }
{ "file" = "/boot" }
@@ -27,17 +27,17 @@ module Test_fstab =
let no_dump = "/dev/vg00/lv00\t /\t ext3\t defaults\n"
- let no_dump_tree =
+ let no_dump_tree =
{ "1"
{ "spec" = "/dev/vg00/lv00" }
{ "file" = "/" }
{ "vfstype" = "ext3" }
{ "opt" = "defaults" } }
-
+
let multi_opts = "devpts\t /dev/pts\t devpts gid=5,mode=620 0 0\n"
- let multi_opts_tree =
+ let multi_opts_tree =
{ "1"
{ "spec" = "devpts" }
{ "file" = "/dev/pts" }
@@ -46,7 +46,7 @@ module Test_fstab =
{ "opt" = "mode=620" }
{ "dump" = "0" }
{ "passno" = "0" } }
-
+
test Fstab.lns get simple = simple_tree
test Fstab.lns get trailing_ws = simple_tree
diff --git a/lenses/tests/test_gdm.aug b/lenses/tests/test_gdm.aug
index 58e9eef..50b12f3 100644
--- a/lenses/tests/test_gdm.aug
+++ b/lenses/tests/test_gdm.aug
@@ -10,7 +10,7 @@ AutomaticLogin=
0=Standard device=/dev/console
"
- test Gdm.lns get conf =
+ test Gdm.lns get conf =
{ "daemon"
{ "#comment" = "Automatic login, if true the first attached screen will automatically logged" }
{ "#comment" = "in as user as set with AutomaticLogin key." }
diff --git a/lenses/tests/test_hosts.aug b/lenses/tests/test_hosts.aug
index 3792008..2bc61fb 100644
--- a/lenses/tests/test_hosts.aug
+++ b/lenses/tests/test_hosts.aug
@@ -43,18 +43,18 @@ module Test_hosts =
(* Make sure blank and indented lines get through *)
test Hosts.lns get " \t 127.0.0.1\tlocalhost \n \n\n
-127.0.1.1\tetch.example.com\tetch\n" =
+127.0.1.1\tetch.example.com\tetch\n" =
{ "1" { "ipaddr" = "127.0.0.1" }
{ "canonical" = "localhost" } }
{} {} {}
{ "2" { "ipaddr" = "127.0.1.1" }
- { "canonical" = "etch.example.com" }
+ { "canonical" = "etch.example.com" }
{ "alias" = "etch" } }
(* Comment at the end of a line *)
test Hosts.lns get "127.0.0.1 localhost # must always be there \n" =
{ "1" { "ipaddr" = "127.0.0.1" }
- { "canonical" = "localhost" }
+ { "canonical" = "localhost" }
{ "#comment" = "must always be there" } }
(* Local Variables: *)
diff --git a/lenses/tests/test_inifile.aug b/lenses/tests/test_inifile.aug
index f19ea58..6155e30 100644
--- a/lenses/tests/test_inifile.aug
+++ b/lenses/tests/test_inifile.aug
@@ -22,7 +22,7 @@ test_ace =
; comment with colon
"
- test lns_ace get conf_ace =
+ test lns_ace get conf_ace =
{ "#comment" = "comment with sharp" }
{}
{ "section1"
@@ -42,12 +42,12 @@ test_ace =
let lns_acf = IniFile.lns_noempty record_acf comment_acf
let conf_acf = "# comment with sharp
[section1]
-test_acf = value
+test_acf = value
test_acf =
test_acf : value2 # end of line comment
; comment with colon
"
- test lns_acf get conf_acf =
+ test lns_acf get conf_acf =
{ "#comment" = "comment with sharp" }
{ "section1"
{ "test_acf" = "value" }
@@ -95,7 +95,7 @@ test_ade =
test_adf = value
test_adf : value2 ; end of line comment
; comment with colon
-test_adf =
+test_adf =
"
test lns_adf get conf_adf =
{ "#comment" = "a first comment with colon" }
@@ -122,7 +122,7 @@ test_bce = value # end of line comment
test_bce =
"
- test lns_bce get conf_bce =
+ test lns_bce get conf_bce =
{ "#comment" = "comment with sharp" }
{}
{ "section1"
@@ -146,7 +146,7 @@ test_bcf = value # end of line comment
; comment with colon
test_bcf =
"
- test lns_bcf get conf_bcf =
+ test lns_bcf get conf_bcf =
{ "#comment" = "comment with sharp" }
{ "section1"
{ "test_bcf" = "value"
@@ -168,9 +168,9 @@ test_bcf =
test_bde = value ; end of line comment
; comment with colon
-test_bde =
+test_bde =
"
- test lns_bde get conf_bde =
+ test lns_bde get conf_bde =
{ "#comment" = "first comment with colon" }
{}
{ "section1"
@@ -192,9 +192,9 @@ test_bde =
[section1]
test_bdf = value ; end of line comment
; comment with colon
-test_bdf =
+test_bdf =
"
- test lns_bdf get conf_bdf =
+ test lns_bdf get conf_bdf =
{ "#comment" = "first comment with colon" }
{ "section1"
{ "test_bdf" = "value"
diff --git a/lenses/tests/test_interfaces.aug b/lenses/tests/test_interfaces.aug
index 9495b4a..0c40296 100644
--- a/lenses/tests/test_interfaces.aug
+++ b/lenses/tests/test_interfaces.aug
@@ -1,4 +1,4 @@
-module Test_interfaces =
+module Test_interfaces =
let conf ="# This file describes the network interfaces available on your system
# and how to activate them. For more information, see interfaces(5).
@@ -53,7 +53,7 @@ mapping eth1
{ "mapping" = "eth0"
{ "script" = "/usr/local/sbin/map-scheme"}
{ "map" = "HOME eth0-home"}
- { "map" = "WORK eth0-work"}
+ { "map" = "WORK eth0-work"}
{} }
{ "iface" = "eth0-home"
{ "family" = "inet"}
diff --git a/lenses/tests/test_logrotate.aug b/lenses/tests/test_logrotate.aug
index bb3f79b..915a198 100644
--- a/lenses/tests/test_logrotate.aug
+++ b/lenses/tests/test_logrotate.aug
@@ -1,4 +1,4 @@
-module Test_logrotate =
+module Test_logrotate =
let conf = "# see man logrotate for details
# rotate log files weekly
@@ -19,7 +19,7 @@ tabooext + .old .orig .ignore
include /etc/logrotate.d
# no packages own wtmp, or btmp -- we'll rotate them here
-/var/log/wtmp
+/var/log/wtmp
{
missingok
monthly
@@ -60,7 +60,7 @@ include /etc/logrotate.d
}
"
- test Logrotate.lns get conf =
+ test Logrotate.lns get conf =
{ "#comment" = "see man logrotate for details" }
{ "#comment" = "rotate log files weekly" }
{ "schedule" = "weekly" }
@@ -126,7 +126,7 @@ include /etc/logrotate.d
{ "prerotate" = " if [ -f /var/run/apache2.pid ]; then
/etc/init.d/apache2 restart > /dev/null
fi
-" } }
+" } }
test Logrotate.lns get "/var/log/file {\n dateext\n}\n" =
{ "rule"
diff --git a/lenses/tests/test_monit.aug b/lenses/tests/test_monit.aug
index b397055..e27974d 100644
--- a/lenses/tests/test_monit.aug
+++ b/lenses/tests/test_monit.aug
@@ -29,7 +29,7 @@ test Monit.lns get conf =
{}
{ "check"
{ "process" = "httpd with pidfile /usr/local/apache2/logs/httpd.pid" }
- { "group" = "www-data" }
+ { "group" = "www-data" }
{ "start" = "program \"/usr/local/apache2/bin/apachectl start\"" }
{ "stop" = "program \"/usr/local/apache2/bin/apachectl stop\"" }
}
diff --git a/lenses/tests/test_ntp.aug b/lenses/tests/test_ntp.aug
index 3bdd60b..4906873 100644
--- a/lenses/tests/test_ntp.aug
+++ b/lenses/tests/test_ntp.aug
@@ -26,7 +26,7 @@ filegen peerstats file peerstats type day disable
filegen clockstats file clockstats type day enable nolink
"
- test Ntp.lns get conf =
+ test Ntp.lns get conf =
{ "#comment" = "" }
{ "#comment" = "Fichier genere par puppet" }
{ "#comment" = "Environnement: development" }
@@ -38,7 +38,7 @@ filegen clockstats file clockstats type day enable nolink
{}
{ "driftfile" = "/var/lib/ntp/ntp.drift" }
{}
- { "restrict" = "default"
+ { "restrict" = "default"
{ "action" = "ignore" } }
{}
{ "#comment" = "server dns01.echo-net.net" }
@@ -123,16 +123,16 @@ filegen clockstats file clockstats type day enable nolink
test Ntp.lns get "multicastclient 224.0.1.1\n" =
{ "multicastclient" = "224.0.1.1" }
- test Ntp.lns put "broadcastclient\tnovolley # broadcast\n"
- after rm "/*/novolley" = "broadcastclient # broadcast\n"
+ test Ntp.lns put "broadcastclient\tnovolley # broadcast\n"
+ after rm "/*/novolley" = "broadcastclient # broadcast\n"
- test Ntp.auth_command get "trustedkey 4 8 42\n" =
+ test Ntp.auth_command get "trustedkey 4 8 42\n" =
{ "trustedkey"
{ "key" = "4" }
{ "key" = "8" }
{ "key" = "42" } }
- test Ntp.auth_command get "trustedkey 42\n" =
+ test Ntp.auth_command get "trustedkey 42\n" =
{ "trustedkey" { "key" = "42" } }
test Ntp.lns get "broadcastdelay 0.008\n" =
diff --git a/lenses/tests/test_pam.aug b/lenses/tests/test_pam.aug
index bef99f1..0db4a92 100644
--- a/lenses/tests/test_pam.aug
+++ b/lenses/tests/test_pam.aug
@@ -13,7 +13,7 @@ session optional pam_keyinit.so force revoke
{ "2" { "type" = "session" }
{ "control" = "optional" }
{ "module" = "pam_keyinit.so" }
- { "argument" = "force" }
+ { "argument" = "force" }
{ "argument" = "revoke" } }
test Pam.lns put example after
@@ -30,7 +30,7 @@ session optional pam_keyinit.so force revoke
set "/1/type" "auth"
= trailing_ws
- test Pam.lns get "@include common-password\n" =
+ test Pam.lns get "@include common-password\n" =
{ "include" = "common-password" }
(* Local Variables: *)
diff --git a/lenses/tests/test_php.aug b/lenses/tests/test_php.aug
index bb5633b..3f18f65 100644
--- a/lenses/tests/test_php.aug
+++ b/lenses/tests/test_php.aug
@@ -1,7 +1,7 @@
module Test_php =
let conf = "
-safe_mode = Off
+safe_mode = Off
[PHP]
; Enable the PHP scripting language engine under Apache.
engine = On
@@ -16,7 +16,7 @@ sqlite.assoc_case = 0
"
- test PHP.lns get conf =
+ test PHP.lns get conf =
{ ".anon"
{}
{ "safe_mode" = "Off" } }
diff --git a/lenses/tests/test_postfix_master.aug b/lenses/tests/test_postfix_master.aug
index 285ec3a..4135f9c 100644
--- a/lenses/tests/test_postfix_master.aug
+++ b/lenses/tests/test_postfix_master.aug
@@ -14,7 +14,7 @@ test Postfix_Master.lns get conf =
{ "unpriviliged" = "-" }
{ "chroot" = "-" }
{ "wakeup" = "10?" }
- { "limit" = "-" }
+ { "limit" = "-" }
{ "command" = "smtpd" } }
{ "maildrop"
{ "type" = "unix" }
@@ -22,5 +22,5 @@ test Postfix_Master.lns get conf =
{ "unpriviliged" = "n" }
{ "chroot" = "n" }
{ "wakeup" = "-" }
- { "limit" = "-" }
+ { "limit" = "-" }
{ "command" = "pipe\n flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}" } }
diff --git a/lenses/tests/test_samba.aug b/lenses/tests/test_samba.aug
index 8a3c00e..9410fec 100644
--- a/lenses/tests/test_samba.aug
+++ b/lenses/tests/test_samba.aug
@@ -6,7 +6,7 @@ module Test_samba =
#
# This is the main Samba configuration file. You should read the
# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options most of which
+# here. Samba has a huge number of configurable options most of which
# are not shown in this example
#
@@ -41,7 +41,7 @@ module Test_samba =
printing = cups
"
- test Samba.lns get conf =
+ test Samba.lns get conf =
{ "#comment" }
{ "#comment" = "Sample configuration file for the Samba suite for Debian GNU/Linux." }
{ "#comment" }
diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
index 552d20c..9c584d0 100644
--- a/lenses/tests/test_shellvars.aug
+++ b/lenses/tests/test_shellvars.aug
@@ -48,35 +48,35 @@ unset ONBOOT
test Shellvars.lns get key_brack =
{ "SOME_KEY[1]" = "" } { "DEVICE" = "eth0" }
- test Shellvars.lns get "smartd_opts=\"-q never\"\n" =
+ test Shellvars.lns get "smartd_opts=\"-q never\"\n" =
{ "smartd_opts" = "\"-q never\"" }
test Shellvars.lns get "var=val \n" = { "var" = "val" }
- test Shellvars.lns get ". /etc/java/java.conf\n" =
+ test Shellvars.lns get ". /etc/java/java.conf\n" =
{ ".source" = "/etc/java/java.conf" }
(* Quoted strings and other oddities *)
- test Shellvars.lns get "var=\"foo 'bar'\"\n" =
+ test Shellvars.lns get "var=\"foo 'bar'\"\n" =
{ "var" = "\"foo 'bar'\"" }
test Shellvars.lns get "var='Some \"funny\" value'\n" =
{ "var" = "'Some \"funny\" value'" }
- test Shellvars.lns get "var=\"\\\"\"\n" =
+ test Shellvars.lns get "var=\"\\\"\"\n" =
{ "var" = "\"\\\"\"" }
test Shellvars.lns get "var=\\\"\n" =
{ "var" = "\\\"" }
- test Shellvars.lns get "var=ab#c\n" =
+ test Shellvars.lns get "var=ab#c\n" =
{ "var" = "ab#c" }
(* We don't handle comments at the end of a line yet *)
test Shellvars.lns get "var=ab #c\n" = *
(* Handling of arrays *)
- test Shellvars.lns get "var=(val1 \"val\\\"2\\\"\" val3)\n" =
+ test Shellvars.lns get "var=(val1 \"val\\\"2\\\"\" val3)\n" =
{ "var"
{ "1" = "val1" }
{ "2" = "\"val\\\"2\\\"\"" }
@@ -92,11 +92,11 @@ unset ONBOOT
rm "var/*" ;
set "var" "value"
= "var=value\n"
-
+
test Shellvars.lns put "var=(v1 v2)\n" after
set "var/3" "v3"
= "var=(v1 v2 v3)\n"
-
+
(* Local Variables: *)
(* mode: caml *)
(* End: *)
diff --git a/lenses/tests/test_spacevars.aug b/lenses/tests/test_spacevars.aug
index 6b0e8a5..2eea0be 100644
--- a/lenses/tests/test_spacevars.aug
+++ b/lenses/tests/test_spacevars.aug
@@ -1,4 +1,4 @@
-module Test_spacevars =
+module Test_spacevars =
let conf ="# This a spaced key/value configuration file.
keyword value
@@ -6,7 +6,7 @@ keyword value
# I like comments
very.useful-key my=value
-
+
"
let lns = Spacevars.lns (Spacevars.entry Spacevars.entry_re)
diff --git a/lenses/tests/test_squid.aug b/lenses/tests/test_squid.aug
index 0391e0a..93e364e 100644
--- a/lenses/tests/test_squid.aug
+++ b/lenses/tests/test_squid.aug
@@ -43,7 +43,7 @@ test Squid.lns get conf =
{ "http_access"
{ "allow" = "local_network" } }
-(*
+(*
This tests the Debian lenny default squid.conf
Comments were stripped out
*)
@@ -81,7 +81,7 @@ hosts_file /etc/hosts
coredump_dir /var/spool/squid
"
-test Squid.lns get debian_lenny_default =
+test Squid.lns get debian_lenny_default =
{ "acl"
{ "all"
{ "type" = "src" }
diff --git a/lenses/tests/test_sshd.aug b/lenses/tests/test_sshd.aug
index 85c2ea8..afc74ab 100644
--- a/lenses/tests/test_sshd.aug
+++ b/lenses/tests/test_sshd.aug
@@ -34,7 +34,7 @@ HostKey /etc/ssh/ssh_host_dsa_key\n" =
{ "AuthorizedKeysFile" = "%h/.ssh/authorized_keys" }
test Sshd.lns get "Subsystem sftp /usr/lib/openssh/sftp-server\n" =
- { "Subsystem"
+ { "Subsystem"
{ "sftp" = "/usr/lib/openssh/sftp-server" } }
diff --git a/lenses/tests/test_vsftpd.aug b/lenses/tests/test_vsftpd.aug
index df28d35..278910e 100644
--- a/lenses/tests/test_vsftpd.aug
+++ b/lenses/tests/test_vsftpd.aug
@@ -1,6 +1,6 @@
module Test_vsftpd =
-test Vsftpd.lns get "listen=YES\nmdtm_write=false\n" =
+test Vsftpd.lns get "listen=YES\nmdtm_write=false\n" =
{ "listen" = "YES" }
{ "mdtm_write" = "false" }
diff --git a/lenses/tests/test_yum.aug b/lenses/tests/test_yum.aug
index 8b686d9..27052ae 100644
--- a/lenses/tests/test_yum.aug
+++ b/lenses/tests/test_yum.aug
@@ -76,7 +76,7 @@ installonly_limit=100
test Yum.lns get "[repo]\nbaseurl=url1\nbaseurl=url2\n" = *
(* This checks that we take the right branch in the section lens. *)
- test Yum.section get "[repo]\nname=A name\nbaseurl=url1\n" =
+ test Yum.section get "[repo]\nname=A name\nbaseurl=url1\n" =
{ "repo"
{ "name" = "A name" }
{ "baseurl" = "url1" } }
diff --git a/lenses/util.aug b/lenses/util.aug
index 0dced14..a01d8c8 100644
--- a/lenses/util.aug
+++ b/lenses/util.aug
@@ -62,14 +62,14 @@ Variable: indent
(* Group: Comment and empty
This is a general definition of comment and empty.
It allows indentation for comments, removes the leading and trailing spaces
- of comments and stores them in nodes, except for empty comments which are
+ of comments and stores them in nodes, except for empty comments which are
ignored together with empty lines
View: comment
Map comments into "#comment" nodes
*)
- let comment =
- [ indent . label "#comment" . del /#[ \t]*/ "# "
+ let comment =
+ [ indent . label "#comment" . del /#[ \t]*/ "# "
. store /([^ \t\n].*[^ \t\n]|[^ \t\n])/ . eol ]
(*
diff --git a/lenses/xinetd.aug b/lenses/xinetd.aug
index bd75005..f14865e 100644
--- a/lenses/xinetd.aug
+++ b/lenses/xinetd.aug
@@ -3,14 +3,14 @@
* Parses xinetd configuration files
*
* The structure of the lens and allowed attributes are ripped directly
- * from xinetd's parser in xinetd/parse.c in xinetd's source checkout
+ * from xinetd's parser in xinetd/parse.c in xinetd's source checkout
* The downside of being so precise here is that if attributes are added
* they need to be added here, too. Writing a catchall entry, and getting
- * to typecheck correctly would be a huge pain.
+ * to typecheck correctly would be a huge pain.
+ *
+ * A really enterprising soul could tighten this down even further by
+ * restricting the acceptable values for each attribute.
*
- * A really enterprising soul could tighten this down even further by
- * restricting the acceptable values for each attribute.
- *
* Author: David Lutterkort
*)
@@ -47,11 +47,11 @@ module Xinetd =
let attr_lst_op (n:regexp) = attr_lst n op
(* Variable: service_attr
- * Note:
- * It is much faster to combine, for example, all the attr_one
- * attributes into one regexp and pass that to a lens instead of
- * using lens union (attr_one "a" | attr_one "b"|..) because the latter
- * causes the type checker to work _very_ hard.
+ * Note:
+ * It is much faster to combine, for example, all the attr_one
+ * attributes into one regexp and pass that to a lens instead of
+ * using lens union (attr_one "a" | attr_one "b"|..) because the latter
+ * causes the type checker to work _very_ hard.
*)
let service_attr =
@@ -77,14 +77,14 @@ module Xinetd =
| "no_access" | "only_from" | "passenv" | "enabled" )
(* View: body
- * Note:
- * We would really like to say "the body can contain any of a list
- * of a list of attributes, each of them at most once"; but that
- * would require that we build a lens that matches the permutation
- * of all attributes; with around 40 individual attributes, that's
- * not computationally feasible, even if we didn't have to worry
- * about how to write that down. The resulting regular expressions
- * would simply be prohibitively large.
+ * Note:
+ * We would really like to say "the body can contain any of a list
+ * of a list of attributes, each of them at most once"; but that
+ * would require that we build a lens that matches the permutation
+ * of all attributes; with around 40 individual attributes, that's
+ * not computationally feasible, even if we didn't have to worry
+ * about how to write that down. The resulting regular expressions
+ * would simply be prohibitively large.
*)
let body (attr:lens) = Util.del_str "\n{\n"
. (empty|comment|attr)*
@@ -93,15 +93,15 @@ module Xinetd =
(* View: includes
* Note:
* It would be nice if we could use the directories given in include and
- * includedir directives to parse additional files instead of hardcoding
- * all the places where xinetd config files can be found; but that is
- * currently not possible, and implementing that has a good amount of
- * hairy corner cases to consider.
+ * includedir directives to parse additional files instead of hardcoding
+ * all the places where xinetd config files can be found; but that is
+ * currently not possible, and implementing that has a good amount of
+ * hairy corner cases to consider.
*)
let includes = [ key /include|includedir/
. Util.del_ws_spc . store /[^ \t\n]+/ . eol ]
- let service =
+ let service =
let key_re = /[^# \t\n\/]+/ - /include|includedir|defaults/ in
[ del /service[ \t]+/ "service " . key key_re . body service_attr ]
More information about the augeas-devel
mailing list