From: Marcin Siodelski Date: Thu, 8 Sep 2016 10:58:52 +0000 (+0200) Subject: [3684] Updated examples as a result of review. X-Git-Tag: trac5006_base~8^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05072326f3f8756e20641a3c12fa378d967fcc2f;p=thirdparty%2Fkea.git [3684] Updated examples as a result of review. --- diff --git a/doc/examples/kea4/backends.json b/doc/examples/kea4/backends.json index 7fdabe599c..b52b6fade8 100644 --- a/doc/examples/kea4/backends.json +++ b/doc/examples/kea4/backends.json @@ -68,11 +68,7 @@ # "contact_points": "192.0.2.1,192.0.2.2,192.0.2.3" # }, -# Addresses will be assigned with valid lifetimes being 4000. Client -# is told to start renewing after 1000 seconds. If the server does not respond -# after 2000 seconds since the lease was granted, client is supposed -# to start REBIND procedure (emergency renewal that allows switching -# to a different server). +# Addresses will be assigned with valid lifetimes being 4000. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options diff --git a/doc/examples/kea4/leases-expiration.json b/doc/examples/kea4/leases-expiration.json index b1397b3d18..e66f094cca 100644 --- a/doc/examples/kea4/leases-expiration.json +++ b/doc/examples/kea4/leases-expiration.json @@ -10,9 +10,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -34,11 +35,7 @@ "unwarned-reclaim-cycles": 10 }, -# Addresses will be assigned with valid lifetimes being 4000. Client -# is told to start renewing after 1000 seconds. If the server does not respond -# after 2000 seconds since the lease was granted, client is supposed -# to start REBIND procedure (emergency renewal that allows switching -# to a different server). +# Addresses will be assigned with valid lifetimes being 4000. "valid-lifetime": 4000, # The following list defines subnets. We have only one subnet diff --git a/doc/examples/kea4/multiple-options.json b/doc/examples/kea4/multiple-options.json index 817369b28c..ab07ff5fee 100644 --- a/doc/examples/kea4/multiple-options.json +++ b/doc/examples/kea4/multiple-options.json @@ -9,18 +9,15 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. Client -# is told to start renewing after 1000 seconds. If the server does not respond -# after 2000 seconds since the lease was granted, client is supposed -# to start REBIND procedure (emergency renewal that allows switching -# to a different server). +# Addresses will be assigned with valid lifetimes being 4000. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options diff --git a/doc/examples/kea4/mysql-reservations.json b/doc/examples/kea4/mysql-reservations.json index 79e95fb0e4..8bb1ae0530 100644 --- a/doc/examples/kea4/mysql-reservations.json +++ b/doc/examples/kea4/mysql-reservations.json @@ -8,20 +8,18 @@ # Kea is told to listen on ethX interface only. "interfaces-config": { "interfaces": [ "ethX" ] + }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. Client -# is told to start renewing after 1000 seconds. If the server does not respond -# after 2000 seconds since the lease was granted, client is supposed -# to start REBIND procedure (emergency renewal that allows switching -# to a different server). +# Addresses will be assigned with valid lifetimes being 4000. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options diff --git a/doc/examples/kea4/pgsql-reservations.json b/doc/examples/kea4/pgsql-reservations.json index c512c4d300..3f6b91b8b7 100644 --- a/doc/examples/kea4/pgsql-reservations.json +++ b/doc/examples/kea4/pgsql-reservations.json @@ -10,18 +10,16 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. + +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. Client -# is told to start renewing after 1000 seconds. If the server does not respond -# after 2000 seconds since the lease was granted, client is supposed -# to start REBIND procedure (emergency renewal that allows switching -# to a different server). +# Addresses will be assigned with valid lifetimes being 4000. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options diff --git a/doc/examples/kea4/reservations.json b/doc/examples/kea4/reservations.json index 3ebfcaf002..328a6b3511 100644 --- a/doc/examples/kea4/reservations.json +++ b/doc/examples/kea4/reservations.json @@ -9,18 +9,15 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. Client -# is told to start renewing after 1000 seconds. If the server does not respond -# after 2000 seconds since the lease was granted, client is supposed -# to start REBIND procedure (emergency renewal that allows switching -# to a different server). +# Addresses will be assigned with valid lifetimes being 4000. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options diff --git a/doc/examples/kea4/several-subnets.json b/doc/examples/kea4/several-subnets.json index 68f0d46afc..f33892a352 100644 --- a/doc/examples/kea4/several-subnets.json +++ b/doc/examples/kea4/several-subnets.json @@ -10,9 +10,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -37,19 +38,18 @@ "subnet": "192.0.4.0/24" } ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp4", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], - "debuglevel": 99, - "severity": "DEBUG" + "severity": "INFO" } ] } diff --git a/doc/examples/kea4/single-subnet.json b/doc/examples/kea4/single-subnet.json index 385a2dda6b..c3793db668 100644 --- a/doc/examples/kea4/single-subnet.json +++ b/doc/examples/kea4/single-subnet.json @@ -10,18 +10,15 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, -# Addresses will be assigned with valid lifetimes being 4000. Client -# is told to start renewing after 1000 seconds. If the server does not respond -# after 2000 seconds since the lease was granted, client is supposed -# to start REBIND procedure (emergency renewal that allows switching -# to a different server). +# Addresses will be assigned with valid lifetimes being 4000. "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options diff --git a/doc/examples/kea6/advanced.json b/doc/examples/kea6/advanced.json index 821db2bb2d..4ecd8f32dc 100644 --- a/doc/examples/kea6/advanced.json +++ b/doc/examples/kea6/advanced.json @@ -15,9 +15,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -71,19 +72,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], - "debuglevel": 99, - "severity": "DEBUG" + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/backends.json b/doc/examples/kea6/backends.json index 83a98f67c4..8a71510461 100644 --- a/doc/examples/kea6/backends.json +++ b/doc/examples/kea6/backends.json @@ -90,15 +90,15 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], "debuglevel": 0, diff --git a/doc/examples/kea6/classify.json b/doc/examples/kea6/classify.json index eac05896c7..020f5ed2d8 100644 --- a/doc/examples/kea6/classify.json +++ b/doc/examples/kea6/classify.json @@ -66,19 +66,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } - ], - "debuglevel": 99, - "severity": "DEBUG" + ], + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/duid.json b/doc/examples/kea6/duid.json index 4bc6440482..7d267cdae8 100644 --- a/doc/examples/kea6/duid.json +++ b/doc/examples/kea6/duid.json @@ -30,9 +30,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -50,7 +51,7 @@ # The following list defines subnets. Each subnet consists of at # least subnet and pool entries. - "subnet6": [ + "subnet6": [ { "pools": [ { "pool": "2001:db8:1::/80" } ], "subnet": "2001:db8:1::/64", @@ -59,17 +60,17 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } - ], + ], "debuglevel": 0, "severity": "INFO" } diff --git a/doc/examples/kea6/leases-expiration.json b/doc/examples/kea6/leases-expiration.json index 59fea3022b..0ec34df109 100644 --- a/doc/examples/kea6/leases-expiration.json +++ b/doc/examples/kea6/leases-expiration.json @@ -10,9 +10,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -56,19 +57,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], - "debuglevel": 99, - "severity": "DEBUG" + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/multiple-options.json b/doc/examples/kea6/multiple-options.json index 231a2ed306..498f718a4d 100644 --- a/doc/examples/kea6/multiple-options.json +++ b/doc/examples/kea6/multiple-options.json @@ -9,9 +9,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -49,19 +50,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], - "debuglevel": 99, - "severity": "DEBUG" + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/mysql-reservations.json b/doc/examples/kea6/mysql-reservations.json index ec50656ee2..e1f791c575 100644 --- a/doc/examples/kea6/mysql-reservations.json +++ b/doc/examples/kea6/mysql-reservations.json @@ -10,9 +10,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -71,19 +72,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], - "debuglevel": 99, - "severity": "DEBUG" + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/pgsql-reservations.json b/doc/examples/kea6/pgsql-reservations.json index 170c03e7d7..a75d21a057 100644 --- a/doc/examples/kea6/pgsql-reservations.json +++ b/doc/examples/kea6/pgsql-reservations.json @@ -10,9 +10,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -71,19 +72,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], - "debuglevel": 99, - "severity": "DEBUG" + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/reservations.json b/doc/examples/kea6/reservations.json index 79bf115575..abf73f91a2 100644 --- a/doc/examples/kea6/reservations.json +++ b/doc/examples/kea6/reservations.json @@ -12,9 +12,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -109,19 +110,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } ], - "debuglevel": 99, - "severity": "DEBUG" + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/several-subnets.json b/doc/examples/kea6/several-subnets.json index ca93b8b431..48d0bdb5b4 100644 --- a/doc/examples/kea6/several-subnets.json +++ b/doc/examples/kea6/several-subnets.json @@ -10,9 +10,10 @@ "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -30,19 +31,19 @@ # The following list defines subnets. Each subnet consists of at # least subnet and pool entries. - "subnet6": [ + "subnet6": [ { "pools": [ { "pool": "2001:db8:1::/80" } ], "subnet": "2001:db8:1::/64" }, { "pools": [ { "pool": "2001:db8:2::/80" } ], - "subnet": "2001:db8:2::/64" }, + "subnet": "2001:db8:2::/64" }, { "pools": [ { "pool": "2001:db8:3::/80" } ], "subnet": "2001:db8:3::/64" }, { "pools": [ { "pool": "2001:db8:4::/80" } ], "subnet": "2001:db8:4::/64" } ] }, -# The following configures logging. It assumes that warning messages -# will be logged to stdout. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { @@ -52,7 +53,8 @@ "output": "stdout" } ], - "severity": "WARN" + "debuglevel": 0, + "severity": "INFO" } ] } diff --git a/doc/examples/kea6/simple.json b/doc/examples/kea6/simple.json index 7d0234683a..f7a77008cf 100644 --- a/doc/examples/kea6/simple.json +++ b/doc/examples/kea6/simple.json @@ -5,15 +5,16 @@ { "Dhcp6": -{ +{ # Kea is told to listen on ethX interface only. "interfaces-config": { "interfaces": [ "ethX" ] }, -# We need to specify lease type. As of May 2014, three backends are supported: -# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require -# any prior set up. +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. "lease-database": { "type": "memfile" }, @@ -31,7 +32,7 @@ # The following list defines subnets. Each subnet consists of at # least subnet and pool entries. - "subnet6": [ + "subnet6": [ { "pools": [ { "pool": "2001:db8:1::/80" } ], "subnet": "2001:db8:1::/64", @@ -40,19 +41,19 @@ ] }, -# The following configures logging. Kea will log all debug messages -# to /var/log/kea-debug.log file. +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error) will will be logged to stdout. "Logging": { "loggers": [ { "name": "kea-dhcp6", "output_options": [ { - "output": "/var/log/kea-debug.log" + "output": "stdout" } - ], - "debuglevel": 99, - "severity": "DEBUG" + ], + "debuglevel": 0, + "severity": "INFO" } ] }