diff --git a/tools/shell/templates/apache b/tools/shell/templates/apache index ebafa83ba1..20c686e623 100644 --- a/tools/shell/templates/apache +++ b/tools/shell/templates/apache @@ -1,49 +1,49 @@ %name apache # Apache web server # # This template generates a single primitive resource of type apache %depends_on virtual-ip # NB: # The apache RA monitor operation requires the status module to # be loaded and access to its page (/server-status) allowed from # localhost (127.0.0.1). Typically, the status module is not # loaded by default. How to enable it depends on your # distribution. For instance, on recent openSUSE or SLES # releases, it is enough to add word "status" to the list in # variable APACHE_MODULES in file /etc/sysconfig/apache2. %required # Name the apache resource # (for example: web-1) %% id # The full pathname of the Apache configuration file %% configfile %optional # Extra options to apply when starting apache. See man httpd(8). %% options # Files (one or more) which contain extra environment variables, # such as /etc/apache2/envvars %% envfiles %generate primitive %_:id ocf:heartbeat:apache params configfile=%_:configfile opt options=%_:options opt envfiles=%_:envfiles monitor %_:id 120s:60s -group %_ %_:id %virtual-ip:id +group %_ %_:id %virtual-ip diff --git a/tools/shell/templates/virtual-ip b/tools/shell/templates/virtual-ip index bd7502bfd3..cf0b526507 100644 --- a/tools/shell/templates/virtual-ip +++ b/tools/shell/templates/virtual-ip @@ -1,36 +1,31 @@ %name virtual-ip # Virtual IP address # # This template generates a single primitive resource of type IPaddr %required -# Name the IP address resource -# (for example: ip-1) - -%% id - # Specify an IP address # (for example: 192.168.1.101) %% ip %optional # If your network has a mask different from its class mask, then # specify it here either in CIDR format or as a dotted quad # (for example: 24 or 255.255.255.0) %% netmask # Need LVS support? Set this to true then. %% lvs_support %generate -primitive %_:id ocf:heartbeat:IPaddr +primitive %_ ocf:heartbeat:IPaddr params ip=%_:ip opt cidr_netmask=%_:netmask opt lvs_support=%_:lvs_support