diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-03-10 16:27:56 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-03-10 16:27:56 -0700 |
| commit | 1c352fd2c2fe87d398e288f536cf9178406ce749 (patch) | |
| tree | e8f5f9db43d1bdd07a0b86612b0bf01291191de0 /templates/system | |
| parent | 6885004534d18d087a2ec8810cbeacb163efdaad (diff) | |
| parent | e7b2082e077f2ac4625f8a7e2a45749b3ce56140 (diff) | |
| download | vyatta-cfg-quagga-1c352fd2c2fe87d398e288f536cf9178406ce749.tar.gz vyatta-cfg-quagga-1c352fd2c2fe87d398e288f536cf9178406ce749.zip | |
Merge branch 'glendale' into hollywood
Diffstat (limited to 'templates/system')
| -rw-r--r-- | templates/system/package/repository/node.def | 17 | ||||
| -rw-r--r-- | templates/system/syslog/file/node.def | 1 |
2 files changed, 12 insertions, 6 deletions
diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def index e07967ee..d2e4cf38 100644 --- a/templates/system/package/repository/node.def +++ b/templates/system/package/repository/node.def @@ -1,11 +1,16 @@ tag: + type: txt -help: Name describing the repository + +help: Name a debian archive + commit:expression: $VAR(./url/) != ""; "Must configure the repository URL" commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution" -commit:expression: $VAR(./components/) != ""; "Must configure the repository component" -update:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ +commit:expression: $VAR(./components/) != ""; "Must configure the repository components" + +update: sudo sh -c "touch /etc/apt/sources.list && \ sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \ -echo \\\"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\\\" >> /etc/apt/sources.list\" " -delete:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ -sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list\" " +echo \"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\" >> /etc/apt/sources.list" + +delete: sudo sh -c "touch /etc/apt/sources.list && \ +sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list" diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def index 3861dd53..fa4fd7d0 100644 --- a/templates/system/syslog/file/node.def +++ b/templates/system/syslog/file/node.def @@ -2,3 +2,4 @@ tag: type: txt help: Name of the syslog file to save log messages to syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)" +commit:expression: $VAR(./facility/) != "" || $VAR(./archive/) != ""; "Must specify either facility or archive for syslog file" |