Updated all templates to use instance variables

irc/templates/ircd-ratbox-services.conf.erb

@@ -16,11 +16,11 @@ connect "ratbox.services" {
 	/* passwords: the passwords we send (OLD C:) and accept (OLD N:).
 	 * The remote server will have these passwords reversed.
 	 */
-	send_password = "<%= servpass %>";
-	accept_password = "<%= servpass %>";
+	send_password = "<%= @servpass %>";
+	accept_password = "<%= @servpass %>";
 
 	/* port: the port to connect to this server on */
-	port = <%= port %>;
+	port = <%= @port %>;
 
 	/* hub mask: the mask of servers that this server may hub. Multiple
 	 * entries are permitted

irc/templates/ircd-ratbox.conf.erb

@@ -28,7 +28,7 @@
  /* serverinfo {}:  Contains information about the server. (OLD M:) */
 serverinfo {
 	/* name: the name of our server */
-	name = "<%= servername %>";
+	name = "<%= @servername %>";
 
 	/* sid: the unique server id of our server.  This must be three
 	 * characters long.  The first character must be a digit [0-9], the
@@ -41,13 +41,13 @@ serverinfo {
 	/* description: the description of our server.  '[' and ']' may not
 	 * be used here for compatibility with older servers.
 	 */
-	description = "<%= serverdesc %>";
+	description = "<%= @serverdesc %>";
 
 	/* network info: the name and description of the network this server
 	 * is on.  Shown in the 005 reply and used with serverhiding.
 	 */
-	network_name = "<%= name %>";
-	network_desc = "<%= desc %>";
+	network_name = "<%= @name %>";
+	network_desc = "<%= @desc %>";
 
 	/* hub: allow this server to act as a hub and have multiple servers
 	 * connected to it.  
@@ -218,18 +218,18 @@ class "server" {
 /* listen {}: contain information about the ports ircd listens on (OLD P:) */
 listen {
 	host = "127.0.0.1";
-	port = <%= port %>;
+	port = <%= @port %>;
 };
 listen {
-	sslport = <%= sslport %>;
+	sslport = <%= @sslport %>;
 };
 
 /* auth {}: allow users to connect to the ircd (OLD I:) */
 auth {
 	user = "*@*";
 	class = "users";
-<% if userpass != "" -%>
-	password = "<%= userpass %>";
+<% if @userpass != "" -%>
+	password = "<%= @userpass %>";
 	flags = encrypted;
 <% end -%>
 };
@@ -245,7 +245,7 @@ operator "root" {
 	 * supported now.
  	 * multiple user="" lines are supported.
 	 */
-<% operator.each do |user| -%>
+<% @operator.each do |user| -%>
 	user = "<%= user %>";
 <% end -%>
 
@@ -253,7 +253,7 @@ operator "root" {
 	 * contained in flags = ...; this will need to be encrypted using 
 	 * ratbox-mkpasswd, MD5 is supported
 	 */
-	password = "<%= operpass %>";
+	password = "<%= @operpass %>";
 
 	/* rsa key: the public key for this oper when using Challenge.
 	 * A password should not be defined when this is used, see 
@@ -641,7 +641,7 @@ general {
 	connect_timeout = 30 seconds;
 
 	/* disable auth: disables identd checking */
-	disable_auth = <%= disable_identd %>;
+	disable_auth = <%= @disable_identd %>;
 
 	/* no oper flood: increase flood limits for opers. */
 	no_oper_flood = yes;

irc/templates/ircd-ratbox.init.erb

@@ -22,9 +22,9 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/ircd-ratbox
 DEFAULT=/etc/default/ircd-ratbox
-NAME="ircd-<%= name %>"
+NAME="ircd-<%= @name %>"
 DESC="ratbox IRC Server"
-BASEDIR="/var/lib/ratbox/<%= name %>"
+BASEDIR="/var/lib/ratbox/<%= @name %>"
 ENABLED=1
 
 test -f $DAEMON || exit 0

irc/templates/ratbox-services.conf.erb

@@ -130,7 +130,7 @@ admin {
 /* connect: specifies a server to connect to, name of uplink
  *          is specified in quotation marks
  */
-connect "<%= servername %>" {
+connect "<%= @servername %>" {
         /* host: the host to connect to */
         host = "127.0.0.1";
 
@@ -138,10 +138,10 @@ connect "<%= servername %>" {
         # vhost = "10.0.0.2";
 
         /* password: the password to use */
-        password = "<%= servpass %>";
+        password = "<%= @servpass %>";
 
         /* port: the port to connect on */
-        port = <%= port %>;
+        port = <%= @port %>;
 
 	/* autoconn: auto connect to this server.  default yes */
 	# autoconn = no;
@@ -154,7 +154,7 @@ operator "root" {
         /* user: specifies a user@host who may connect.
 	 * multiple may be specified, wildcards are accepted.
          */
-<% operator.each do |user| -%>
+<% @operator.each do |user| -%>
 	user = "<%= user %>";
 <% end -%>
 
@@ -164,7 +164,7 @@ operator "root" {
 	#user = "flame@127.0.0.1", "irc.ircd-ratbox.org";
 
         /* password: the password to login */
-        password = "<%= operpass %>";
+        password = "<%= @operpass %>";
 
         /* encrypted: specifies whether the above password has been
          * encrypted or not.  default: yes

irc/templates/ratbox-services.init.erb

@@ -23,9 +23,9 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/ratbox-services
 DEFAULT=/etc/default/ratbox-services
-NAME="ratbox-services-<%= name %>"
+NAME="ratbox-services-<%= @name %>"
 DESC="ratbox IRC Services"
-BASEDIR="/var/lib/ratbox-services/<%= name %>"
+BASEDIR="/var/lib/ratbox-services/<%= @name %>"
 UID=$(id -u irc)
 GID=$(id -g irc)
 ENABLED=1