From: elijah <elijah@riseup.net>
Date: Fri, 1 Mar 2013 03:51:36 +0000 (-0800)
Subject: change json comments from '#' to more standard '//'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d78643049e18749994ca39e18f02be3f3d23bd88;p=leap%2Fleap_cli.git

change json comments from '#' to more standard '//'
---

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
diff --git a/test/leap_platform/provider_base/services/openvpn.json b/test/leap_platform/provider_base/services/openvpn.json
index 8c0965e..00cd957 100644
--- a/test/leap_platform/provider_base/services/openvpn.json
+++ b/test/leap_platform/provider_base/services/openvpn.json
@@ -1,7 +1,7 @@
-#
-#  "server_crt": "= file :node_x509_cert",
-#  "server_key": "= file :node_x509_key"
-#
+//
+//  "server_crt": "= file :node_x509_cert",
+//  "server_key": "= file :node_x509_key"
+//
 {
   "service_type": "user_service",
   "x509": {
diff --git a/test/provider/common.json b/test/provider/common.json
index 1ccd624..fa73051 100644
--- a/test/provider/common.json
+++ b/test/provider/common.json
@@ -1,6 +1,6 @@
-#
-# Options put here are inherited by all nodes.
-#
+//
+// Options put here are inherited by all nodes.
+//
 {
   "ssh": {
     "port": 22
diff --git a/test/provider/nodes/ns1.json b/test/provider/nodes/ns1.json
index 6323d10..afb5ef1 100644
--- a/test/provider/nodes/ns1.json
+++ b/test/provider/nodes/ns1.json
@@ -1,6 +1,6 @@
-#
-# this is a comment
-#
+//
+// this is a comment
+//
 {
   "services": "dns",
   "tags": "production",
diff --git a/test/provider/nodes/ns2.json b/test/provider/nodes/ns2.json
index eeba9df..e1917fb 100644
--- a/test/provider/nodes/ns2.json
+++ b/test/provider/nodes/ns2.json
@@ -1,6 +1,6 @@
-#
-# A nameserver
-#
+//
+// A nameserver
+//
 {
   "services": "dns",
   "tags": "production",
diff --git a/test/provider/provider.json b/test/provider/provider.json
index 3db2441..4fff3bf 100644
--- a/test/provider/provider.json
+++ b/test/provider/provider.json
@@ -1,6 +1,6 @@
-#
-# General service provider configuration.
-#
+//
+// General service provider configuration.
+//
 {
   "domain": "bitmask.net",
   "name": {