Rename the config.* CLI command family to vcl.*. It is more intuitive

that way and we may eventually want a config file for varnishd to
control obscure parameters.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@998 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_cli.c b/varnish-cache/bin/varnishd/cache_cli.c
index fd8ff6c0d4f23fbf6071d907e4ce24311dd5e243..56b8503f1c42dd508c7e0e3ec2863316b4fbab8b 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -40,10 +40,10 @@ struct cli_proto CLI_cmds[] = {
        { CLI_URL_QUERY,        cli_func_url_query },
 #endif
        { CLI_URL_PURGE,        cli_func_url_purge },
-       { CLI_CONFIG_LOAD,      cli_func_config_load },
-       { CLI_CONFIG_LIST,      cli_func_config_list },
-       { CLI_CONFIG_DISCARD,   cli_func_config_discard },
-       { CLI_CONFIG_USE,       cli_func_config_use },
+       { CLI_VCL_LOAD,         cli_func_config_load },
+       { CLI_VCL_LIST,         cli_func_config_list },
+       { CLI_VCL_DISCARD,      cli_func_config_discard },
+       { CLI_VCL_USE,          cli_func_config_use },
 
        /* Undocumented */
        { "dump.pool", "dump.pool",

diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index 823abe4a53c85156cfe918d36655b9ebf1c0cac6..64f4f45bf0d4679ec616377c7ad51d72f0e33f73 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -110,11 +110,11 @@ static struct cli_proto mgt_cli_proto[] = {
        { CLI_SERVER_START,     mcf_server_startstop, NULL },
        { CLI_SERVER_STOP,      mcf_server_startstop, &cli_proto },
        { CLI_STATS,            mcf_stats, NULL },
-       { CLI_CONFIG_LOAD,      mcf_config_load, NULL },
-       { CLI_CONFIG_INLINE,    mcf_config_inline, NULL },
-       { CLI_CONFIG_USE,       mcf_config_use, NULL },
-       { CLI_CONFIG_DISCARD,   mcf_config_discard, NULL },
-       { CLI_CONFIG_LIST,      mcf_config_list, NULL },
+       { CLI_VCL_LOAD,         mcf_config_load, NULL },
+       { CLI_VCL_INLINE,       mcf_config_inline, NULL },
+       { CLI_VCL_USE,          mcf_config_use, NULL },
+       { CLI_VCL_DISCARD,      mcf_config_discard, NULL },
+       { CLI_VCL_LIST,         mcf_config_list, NULL },
        { CLI_PARAM_SHOW,       mcf_param_show, NULL },
        { CLI_PARAM_SET,        mcf_param_set, NULL },
        { CLI_HELP,             cli_func_help, NULL },

diff --git a/varnish-cache/include/cli.h b/varnish-cache/include/cli.h
index 7eb05d6eccb2a376a86de8f6a3b393f1be460418..1cb541875e4a44e8881ed1c34c3a481fb5880a4f 100644 (file)
--- a/varnish-cache/include/cli.h
+++ b/varnish-cache/include/cli.h
@@ -47,33 +47,33 @@
        "\tReturns all metadata for the specified URL",                 \
        1, 1
 
-#define CLI_CONFIG_LOAD                                                        \
-       "config.load",                                                  \
-       "config.load <configname> <filename>",                          \
+#define CLI_VCL_LOAD                                                   \
+       "vcl.load",                                                     \
+       "vcl.load <configname> <filename>",                             \
        "\tCompile and load the VCL file under the name provided.",     \
        2, 2
 
-#define CLI_CONFIG_INLINE                                              \
-       "config.inline",                                                \
-       "config.inline <configname> <quoted_VCLstring>",                \
+#define CLI_VCL_INLINE                                         \
+       "vcl.inline",                                           \
+       "vcl.inline <configname> <quoted_VCLstring>",           \
        "\tCompile and load the VCL data under the name provided.",     \
        2, 2
 
-#define CLI_CONFIG_DISCARD                                             \
-       "config.discard",                                               \
-       "config.discard <configname>",                                  \
+#define CLI_VCL_DISCARD                                                \
+       "vcl.discard",                                          \
+       "vcl.discard <configname>",                                     \
        "\tUnload the named configuration (when possible).",            \
        1, 1
 
-#define CLI_CONFIG_LIST                                                        \
-       "config.list",                                                  \
-       "config.list",                                                  \
+#define CLI_VCL_LIST                                                   \
+       "vcl.list",                                                     \
+       "vcl.list",                                                     \
        "\tList all loaded configuration.",                             \
        0, 0
 
-#define CLI_CONFIG_USE                                                 \
-       "config.use",                                                   \
-       "config.use <configname>",                                      \
+#define CLI_VCL_USE                                                    \
+       "vcl.use",                                                      \
+       "vcl.use <configname>",                                 \
        "\tSwitch to the named configuration immediately.",             \
        1, 1