From a87f7d340fe8fcf313c401b04ce4f0f72f0b877a Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Sat, 2 Nov 2013 23:34:40 +0200
Subject: [PATCH] irc: Add operuser parameter, config fixes

---
 irc/manifests/init.pp                  |  8 +++++---
 irc/templates/ircd-ratbox.conf.erb     | 10 +++++-----
 irc/templates/ircd-ratbox.init.erb     |  2 +-
 irc/templates/ratbox-services.conf.erb |  2 +-
 irc/templates/ratbox-services.init.erb |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/irc/manifests/init.pp b/irc/manifests/init.pp
index c181527..1587cb3 100644
--- a/irc/manifests/init.pp
+++ b/irc/manifests/init.pp
@@ -70,8 +70,10 @@ class irc::services inherits irc::server {
 #       Certificate source. Defaults to generated self signed cert.
 #   $operator:
 #       List of allowed operators. Defaults to ["*@127.0.0.1"].
+#   $operuser:
+#       Operator user name. Defaults to "root".
 #   $operpass:
-#       Password required for gaining operator privileges.
+#       Operator password hash.
 #   $userpass:
 #       Password required for joining this server.
 #   $service:
@@ -82,8 +84,8 @@ class irc::services inherits irc::server {
 #       Use ident service. Defaults to false.
 #
 define irc::network($desc, $servername, $serverdesc, $port, $sslport,
-                    $sslcert="", $operator=["*@127.0.0.1"], $operpass,
-                    $userpass="", $services=false, $servpass="",
+                    $sslcert="", $operator=["*@127.0.0.1"], $operuser="root",
+                    $operpass, $userpass="", $services=false, $servpass="",
                     $ident=false) {
 
     include irc::server
diff --git a/irc/templates/ircd-ratbox.conf.erb b/irc/templates/ircd-ratbox.conf.erb
index 8585506..4ae65cb 100644
--- a/irc/templates/ircd-ratbox.conf.erb
+++ b/irc/templates/ircd-ratbox.conf.erb
@@ -82,13 +82,13 @@ serverinfo {
 	default_max_clients = 10000;
 
 	/* ssl_private_key: our ssl private key */
-        ssl_private_key = "ircd.pem";
+        ssl_private_key = "/var/lib/ratbox/<%= @name %>/ircd.pem";
 
 	/* ssl_cert: certificate for our ssl server */
-        ssl_cert = "ircd.pem";
+        ssl_cert = "/var/lib/ratbox/<%= @name %>/ircd.pem";
 
 	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
-        ssl_dh_params = "dh.pem";
+        ssl_dh_params = "/var/lib/ratbox/<%= @name %>/dh.pem";
 
 	/* ssld_count: number of ssld processes you want to start, if you
 	 * have a really busy server, using N-1 where N is the number of
@@ -99,7 +99,7 @@ serverinfo {
 	ssld_count = 1;
 
 	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
-	bandb = "ban.db";
+	bandb = "/var/lib/ratbox/<%= @name %>/ban.db";
 };
 
 /* admin {}: contains admin information about the server. (OLD A:) */
@@ -238,7 +238,7 @@ auth {
  * ircd-ratbox no longer supports local operators, privileges are
  * controlled via flags.
  */
-operator "root" {
+operator "<%= @operuser %>" {
 	/* name: the name of the oper must go above */
 
 	/* user: the user@host required for this operator.  CIDR *is*
diff --git a/irc/templates/ircd-ratbox.init.erb b/irc/templates/ircd-ratbox.init.erb
index cc4f83f..c0b4d4a 100755
--- a/irc/templates/ircd-ratbox.init.erb
+++ b/irc/templates/ircd-ratbox.init.erb
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 # ircd-ratbox	Start/stop the ratbox IRC server.
 
diff --git a/irc/templates/ratbox-services.conf.erb b/irc/templates/ratbox-services.conf.erb
index 05ad2ea..e923b9b 100644
--- a/irc/templates/ratbox-services.conf.erb
+++ b/irc/templates/ratbox-services.conf.erb
@@ -150,7 +150,7 @@ connect "<%= @servername %>" {
 /* operator: specifies an oper who has extended access to services.
  *           The username is specified in quotation marks.
  */
-operator "root" {
+operator "<%= @operuser %>" {
         /* user: specifies a user@host who may connect.
 	 * multiple may be specified, wildcards are accepted.
          */
diff --git a/irc/templates/ratbox-services.init.erb b/irc/templates/ratbox-services.init.erb
index 93dab58..9655702 100755
--- a/irc/templates/ratbox-services.init.erb
+++ b/irc/templates/ratbox-services.init.erb
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 # ratbox-services-pgsql	Start/stop the ratbox services.