2 files changed, 37 insertions, 30 deletions
diff --git a/doc/examples/cloud-config-rsyslog.txt b/doc/examples/cloud-config-rsyslog.txt
new file mode 100644
index 00000000..ff60e3a8
--- /dev/null
+++ b/doc/examples/cloud-config-rsyslog.txt
@@ -0,0 +1,37 @@
+## the rsyslog module allows you to configure the systems syslog.
+## configuration of syslog is under the top level cloud-config
+## entry 'rsyslog'.
+##
+## Example:
+#cloud-config
+rsyslog:
+ remotes:
+  # udp to host 'maas.mydomain' port 514
+  maashost: maas.mydomain
+  # udp to ipv4 host on port 514
+  maas: "@[10.5.1.56]:514"
+  # tcp to host ipv6 host on port 555
+  maasipv6: "*.* @@[FE80::0202:B3FF:FE1E:8329]:555"
+ configs:
+   - "*.* @@192.158.1.1"
+   - content: "*.*   @@192.0.2.1:10514"
+     filename: 01-example.conf
+   - content: |
+     *.*   @@syslogd.example.com
+ config_dir: /etc/rsyslog.d
+ config_filename: 20-cloud-config.conf
+ service_reload_command: [your, syslog, reload, command]
+
+## Additionally the following legacy format is supported
+## it is converted into the format above before use.
+##  rsyslog_filename -> rsyslog/config_filename
+##  rsyslog_dir -> rsyslog/config_dir
+##  rsyslog -> rsyslog/configs
+# rsyslog:
+#  - "*.* @@192.158.1.1"
+#  - content: "*.*   @@192.0.2.1:10514"
+#    filename: 01-example.conf
+#  - content: |
+#    *.*   @@syslogd.example.com
+# rsyslog_filename: 20-cloud-config.conf
+# rsyslog_dir: /etc/rsyslog.d
diff --git a/doc/examples/cloud-config-syslog.txt b/doc/examples/cloud-config-syslog.txt
deleted file mode 100644
index 9ec5e120..00000000
--- a/doc/examples/cloud-config-syslog.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-## syslog module allows you to configure the systems syslog.
-## configuration of syslog is under the top level cloud-config
-## entry 'syslog'.
-##
-## "remotes"
-## remotes is a dictionary. items are of 'name: remote_info'
-## name is simply a name (example 'maas'). It has no importance other than
-## for cloud-init merging configs
-##
-## remote_info is of the format
-## * optional filter for log messages
-## default if not present: *.*
-## * optional leading '@' or '@@' (indicates udp or tcp).
-## default if not present (udp): @
-## This is rsyslog format for that. if not present, is '@' which is udp
-## * ipv4 or ipv6 or hostname
-## ipv6 addresses must be encoded in [::1] format. example: @[fd00::1]:514
-## * optional port
-## port defaults to 514
-##
-## Example:
-#cloud-config
-syslog:
- remotes:
-  # udp to host 'maas.mydomain' port 514
-  maashost: maas.mydomain
-  # udp to ipv4 host on port 514
-  maas: "@[10.5.1.56]:514"
-  # tcp to host ipv6 host on port 555
-  maasipv6: "*.* @@[FE80::0202:B3FF:FE1E:8329]:555"