/src/remote/*_client_bodies.h
/src/remote/*_protocol.[ch]
/src/remote/*_stubs.h
+/src/remote/libvirtd.aug
/src/remote/libvirtd.conf
/src/remote/test_libvirtd.aug
/src/rpc/virkeepaliveprotocol.[ch]
$(REMOTE_DRIVER_SOURCES) \
$(LIBVIRTD_SOURCES) \
remote/test_libvirtd.aug.in \
- remote/libvirtd.aug \
+ remote/libvirtd.aug.in \
remote/libvirtd.conf.in \
remote/libvirtd.policy \
remote/libvirtd.rules \
nodist_conf_DATA += remote/libvirtd.conf
+CLEANFILES += remote/libvirtd.aug
+
man8_MANS += libvirtd.8
libvirtd_SOURCES = $(LIBVIRTD_SOURCES)
uninstall-data-remote:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
+remote/libvirtd.aug: remote/libvirtd.aug.in
+ $(AM_V_GEN)$(SED) \
+ -e '/[@]CUT_ENABLE_IP[@]/d' \
+ -e '/[@]END[@]/d' \
+ -e 's|[@]DAEMON_NAME[@]|libvirtd|' \
+ -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
+ $< > $@
+
remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
remote/libvirtd.conf $(AUG_GENTEST)
- $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< > $@
+ $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \
+ $(srcdir)/remote/test_libvirtd.aug.in | \
+ $(SED) \
+ -e '/[@]CUT_ENABLE_IP[@]/d' \
+ -e '/[@]END[@]/d' \
+ -e 's|[@]DAEMON_NAME[@]|libvirtd|' \
+ -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
+ > $@ || rm -f $@
if WITH_SYSCTL
# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+++ /dev/null
-(* /etc/libvirt/libvirtd.conf *)
-
-module Libvirtd =
- autoload xfm
-
- let eol = del /[ \t]*\n/ "\n"
- let value_sep = del /[ \t]*=[ \t]*/ " = "
- let indent = del /[ \t]*/ ""
-
- let array_sep = del /,[ \t\n]*/ ", "
- let array_start = del /\[[ \t\n]*/ "[ "
- let array_end = del /\]/ "]"
-
- let str_val = del /\"/ "\"" . store /[^\"]*/ . del /\"/ "\""
- let bool_val = store /0|1/
- let int_val = store /-?[0-9]+/
- let str_array_element = [ seq "el" . str_val ] . del /[ \t\n]*/ ""
- let str_array_val = counter "el" . array_start . ( str_array_element . ( array_sep . str_array_element ) * ) ? . array_end
-
- let str_entry (kw:string) = [ key kw . value_sep . str_val ]
- let bool_entry (kw:string) = [ key kw . value_sep . bool_val ]
- let int_entry (kw:string) = [ key kw . value_sep . int_val ]
- let str_array_entry (kw:string) = [ key kw . value_sep . str_array_val ]
-
-
- (* Config entry grouped by function - same order as example config *)
- let network_entry = bool_entry "listen_tls"
- | bool_entry "listen_tcp"
- | str_entry "tls_port"
- | str_entry "tcp_port"
- | str_entry "listen_addr"
-
- let sock_acl_entry = str_entry "unix_sock_group"
- | str_entry "unix_sock_ro_perms"
- | str_entry "unix_sock_rw_perms"
- | str_entry "unix_sock_admin_perms"
- | str_entry "unix_sock_dir"
-
- let authentication_entry = str_entry "auth_unix_ro"
- | str_entry "auth_unix_rw"
- | str_entry "auth_tcp"
- | str_entry "auth_tls"
-
- let certificate_entry = str_entry "key_file"
- | str_entry "cert_file"
- | str_entry "ca_file"
- | str_entry "crl_file"
-
- let authorization_entry = bool_entry "tls_no_verify_certificate"
- | bool_entry "tls_no_sanity_certificate"
- | str_array_entry "tls_allowed_dn_list"
- | str_array_entry "sasl_allowed_username_list"
- | str_array_entry "access_drivers"
- | str_entry "tls_priority"
-
- let processing_entry = int_entry "min_workers"
- | int_entry "max_workers"
- | int_entry "max_clients"
- | int_entry "max_queued_clients"
- | int_entry "max_anonymous_clients"
- | int_entry "max_client_requests"
- | int_entry "prio_workers"
-
- let admin_processing_entry = int_entry "admin_min_workers"
- | int_entry "admin_max_workers"
- | int_entry "admin_max_clients"
- | int_entry "admin_max_queued_clients"
- | int_entry "admin_max_client_requests"
-
- let logging_entry = int_entry "log_level"
- | str_entry "log_filters"
- | str_entry "log_outputs"
-
- let auditing_entry = int_entry "audit_level"
- | bool_entry "audit_logging"
-
- let keepalive_entry = int_entry "keepalive_interval"
- | int_entry "keepalive_count"
- | bool_entry "keepalive_required"
-
- let admin_keepalive_entry = int_entry "admin_keepalive_interval"
- | int_entry "admin_keepalive_count"
- | bool_entry "admin_keepalive_required"
-
- let misc_entry = str_entry "host_uuid"
- | str_entry "host_uuid_source"
- | int_entry "ovs_timeout"
-
- (* Each enty in the config is one of the following three ... *)
- let entry = network_entry
- | sock_acl_entry
- | authentication_entry
- | certificate_entry
- | authorization_entry
- | processing_entry
- | admin_processing_entry
- | logging_entry
- | auditing_entry
- | keepalive_entry
- | admin_keepalive_entry
- | misc_entry
- let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
- let empty = [ label "#empty" . eol ]
-
- let record = indent . entry . eol
-
- let lns = ( record | comment | empty ) *
-
- let filter = incl "/etc/libvirt/libvirtd.conf"
- . Util.stdexcl
-
- let xfm = transform lns filter
--- /dev/null
+(* /etc/libvirt/@DAEMON_NAME@.conf *)
+
+module @DAEMON_NAME_UC@ =
+ autoload xfm
+
+ let eol = del /[ \t]*\n/ "\n"
+ let value_sep = del /[ \t]*=[ \t]*/ " = "
+ let indent = del /[ \t]*/ ""
+
+ let array_sep = del /,[ \t\n]*/ ", "
+ let array_start = del /\[[ \t\n]*/ "[ "
+ let array_end = del /\]/ "]"
+
+ let str_val = del /\"/ "\"" . store /[^\"]*/ . del /\"/ "\""
+ let bool_val = store /0|1/
+ let int_val = store /-?[0-9]+/
+ let str_array_element = [ seq "el" . str_val ] . del /[ \t\n]*/ ""
+ let str_array_val = counter "el" . array_start . ( str_array_element . ( array_sep . str_array_element ) * ) ? . array_end
+
+ let str_entry (kw:string) = [ key kw . value_sep . str_val ]
+ let bool_entry (kw:string) = [ key kw . value_sep . bool_val ]
+ let int_entry (kw:string) = [ key kw . value_sep . int_val ]
+ let str_array_entry (kw:string) = [ key kw . value_sep . str_array_val ]
+
+
+ (* Config entry grouped by function - same order as example config *)
+@CUT_ENABLE_IP@
+ let network_entry = bool_entry "listen_tls"
+ | bool_entry "listen_tcp"
+ | str_entry "tls_port"
+ | str_entry "tcp_port"
+ | str_entry "listen_addr"
+@END@
+
+ let sock_acl_entry = str_entry "unix_sock_group"
+ | str_entry "unix_sock_ro_perms"
+ | str_entry "unix_sock_rw_perms"
+ | str_entry "unix_sock_admin_perms"
+ | str_entry "unix_sock_dir"
+
+ let authentication_entry = str_entry "auth_unix_ro"
+ | str_entry "auth_unix_rw"
+@CUT_ENABLE_IP@
+ | str_entry "auth_tcp"
+ | str_entry "auth_tls"
+
+ let certificate_entry = str_entry "key_file"
+ | str_entry "cert_file"
+ | str_entry "ca_file"
+ | str_entry "crl_file"
+
+ let tls_authorization_entry = bool_entry "tls_no_verify_certificate"
+ | bool_entry "tls_no_sanity_certificate"
+ | str_array_entry "tls_allowed_dn_list"
+ | str_entry "tls_priority"
+@END@
+
+ let misc_authorization_entry = str_array_entry "sasl_allowed_username_list"
+ | str_array_entry "access_drivers"
+
+ let processing_entry = int_entry "min_workers"
+ | int_entry "max_workers"
+ | int_entry "max_clients"
+ | int_entry "max_queued_clients"
+ | int_entry "max_anonymous_clients"
+ | int_entry "max_client_requests"
+ | int_entry "prio_workers"
+
+ let admin_processing_entry = int_entry "admin_min_workers"
+ | int_entry "admin_max_workers"
+ | int_entry "admin_max_clients"
+ | int_entry "admin_max_queued_clients"
+ | int_entry "admin_max_client_requests"
+
+ let logging_entry = int_entry "log_level"
+ | str_entry "log_filters"
+ | str_entry "log_outputs"
+
+ let auditing_entry = int_entry "audit_level"
+ | bool_entry "audit_logging"
+
+ let keepalive_entry = int_entry "keepalive_interval"
+ | int_entry "keepalive_count"
+ | bool_entry "keepalive_required"
+
+ let admin_keepalive_entry = int_entry "admin_keepalive_interval"
+ | int_entry "admin_keepalive_count"
+ | bool_entry "admin_keepalive_required"
+
+ let misc_entry = str_entry "host_uuid"
+ | str_entry "host_uuid_source"
+ | int_entry "ovs_timeout"
+
+ (* Each enty in the config is one of the following three ... *)
+ let entry = sock_acl_entry
+ | authentication_entry
+@CUT_ENABLE_IP@
+ | network_entry
+ | certificate_entry
+ | tls_authorization_entry
+@END@
+ | misc_authorization_entry
+ | processing_entry
+ | admin_processing_entry
+ | logging_entry
+ | auditing_entry
+ | keepalive_entry
+ | admin_keepalive_entry
+ | misc_entry
+ let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
+ let empty = [ label "#empty" . eol ]
+
+ let record = indent . entry . eol
+
+ let lns = ( record | comment | empty ) *
+
+ let filter = incl "/etc/libvirt/@DAEMON_NAME@.conf"
+ . Util.stdexcl
+
+ let xfm = transform lns filter
-module Test_libvirtd =
+module Test_@DAEMON_NAME@ =
@CONFIG@
- test Libvirtd.lns get conf =
+ test @DAEMON_NAME_UC@.lns get conf =
+@CUT_ENABLE_IP@
{ "listen_tls" = "0" }
{ "listen_tcp" = "1" }
{ "tls_port" = "16514" }
{ "tcp_port" = "16509" }
{ "listen_addr" = "192.168.0.1" }
+@END@
{ "unix_sock_group" = "libvirt" }
{ "unix_sock_ro_perms" = "0777" }
{ "unix_sock_rw_perms" = "0770" }
{ "unix_sock_dir" = "/var/run/libvirt" }
{ "auth_unix_ro" = "none" }
{ "auth_unix_rw" = "none" }
+@CUT_ENABLE_IP@
{ "auth_tcp" = "sasl" }
{ "auth_tls" = "none" }
+@END@
{ "access_drivers"
{ "1" = "polkit" }
}
+@CUT_ENABLE_IP@
{ "key_file" = "/etc/pki/libvirt/private/serverkey.pem" }
{ "cert_file" = "/etc/pki/libvirt/servercert.pem" }
{ "ca_file" = "/etc/pki/CA/cacert.pem" }
{ "2" = "DN2"}
}
{ "tls_priority" = "NORMAL" }
+@END@
{ "sasl_allowed_username_list"
{ "1" = "joe@EXAMPLE.COM" }
{ "2" = "fred@EXAMPLE.COM" }
{ "admin_max_client_requests" = "5" }
{ "log_level" = "3" }
{ "log_filters" = "1:qemu 1:libvirt 4:object 4:json 4:event 1:util" }
- { "log_outputs" = "3:syslog:libvirtd" }
+ { "log_outputs" = "3:syslog:@DAEMON_NAME@" }
{ "audit_level" = "2" }
{ "audit_logging" = "1" }
{ "host_uuid" = "00000000-0000-0000-0000-000000000000" }
projects / libvirt.git / commitdiff