aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-02-28 19:51:36 -0800
committerelijah <elijah@riseup.net>2013-02-28 19:51:36 -0800
commitd78643049e18749994ca39e18f02be3f3d23bd88 (patch)
tree9136b2582ace9a792854acf47aa4aef0e1c499ab /lib
parente9a8318dc42146209e4acecc93c4ff62ab6feb7c (diff)
downloadleap_cli-d78643049e18749994ca39e18f02be3f3d23bd88.tar.gz
leap_cli-d78643049e18749994ca39e18f02be3f3d23bd88.tar.bz2
change json comments from '#' to more standard '//'
Diffstat (limited to 'lib')
-rw-r--r--lib/leap_cli/commands/new.rb22
-rw-r--r--lib/leap_cli/config/manager.rb2
2 files changed, 8 insertions, 16 deletions
diff --git a/lib/leap_cli/commands/new.rb b/lib/leap_cli/commands/new.rb
index bf8e7f1..dc37265 100644
--- a/lib/leap_cli/commands/new.rb
+++ b/lib/leap_cli/commands/new.rb
@@ -81,15 +81,7 @@ module LeapCli; module Commands
end
def leapfile_content(options)
- # @leap_version = "#{LeapCli::VERSION}"
- %[## Required:
-@platform_directory_path = "#{options[:platform]}"
-
-## Optional:
-# @custom_vagrant_vm_line = "config.vm.boot_mode = :gui"
-# @log = "/tmp/leap.log"
-# @vagrant_network = '10.5.5.0/24'
-]
+ %[@platform_directory_path = "#{options[:platform]}"\n# see https://leap.se/en/docs/platform/config for more options]
end
GITIGNORE_CONTENT = <<EOS
@@ -100,9 +92,9 @@ test/cert
EOS
def provider_content(options)
- %[#
-# General service provider configuration.
-#
+ %[//
+// General service provider configuration.
+//
{
"domain": "#{options[:domain]}",
"name": {
@@ -122,9 +114,9 @@ EOS
end
COMMON_CONTENT = <<EOS
-#
-# Options put here are inherited by all nodes.
-#
+//
+// Options put here are inherited by all nodes.
+//
{
}
EOS
diff --git a/lib/leap_cli/config/manager.rb b/lib/leap_cli/config/manager.rb
index b90c741..b5ce092 100644
--- a/lib/leap_cli/config/manager.rb
+++ b/lib/leap_cli/config/manager.rb
@@ -191,7 +191,7 @@ module LeapCli
buffer = StringIO.new
File.open(filename) do |f|
while (line = f.gets)
- next if line =~ /^\s*#/
+ next if line =~ /^\s*\/\//
buffer << line
end
end