Changeset 741

Timestamp:

04/19/06 15:57:02 (7 years ago)

Author:

ahu

Message:

fixes for easier packaging

Location:

trunk/pdns/pdns

Files:

• Makefile-recursor (modified) (2 diffs)
• pdns-recursor.spec (added)
• pdns_recursor.cc (modified) (3 diffs)

trunk/pdns/pdns/Makefile-recursor

@@ -1 +1 @@
 # user editable stuff:
 SBINDIR=/usr/sbin/
+BINDIR=/usr/bin/
+CONFIGDIR="/etc/powerdns/"
 OPTFLAGS?=-O3
 CXXFLAGS:= $(CXXFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS)
@@ -34 +36 @@
 
 install: all
+        -mkdirhier $(DESTDIR)/$(SBINDIR)
         install -s pdns_recursor $(DESTDIR)/$(SBINDIR)
-        install -s rec_control $(DESTDIR)/$(SBINDIR)
+        mkdirhier $(DESTDIR)/$(BINDIR)
+        install -s rec_control $(DESTDIR)/$(BINDIR)
+        -mkdirhier $(DESTDIR)/$(CONFIGDIR)
+        ./pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf
+        
 
 clean:

trunk/pdns/pdns/pdns_recursor.cc

@@ -1175 +1175 @@
     ::arg().set("server-id", "Returned when queried for 'server.id' TXT, defaults to hostname")="";
     ::arg().set("remotes-ringbuffer-entries", "maximum number of packets to store statistics for")="0";
-    ::arg().set("version-string", "maximum number of packets to store statistics for")="PowerDNS Recursor "VERSION" $Id$";
+    ::arg().set("version-string", "string reported on version.pdns or version.bind")="PowerDNS Recursor "VERSION" $Id$";
     ::arg().set("allow-from", "If set, only allow these comma separated netmasks to recurse")="127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12";
     ::arg().set("max-tcp-per-client", "If set, maximum number of TCP sessions per client (IP address)")="0";
@@ -1183 +1183 @@
 
     ::arg().setCmd("help","Provide a helpful message");
+    ::arg().setCmd("config","Output blank configuration");
     L.toConsole(Logger::Warning);
     ::arg().laxParse(argc,argv); // do a lax parse
@@ -1201 +1202 @@
       exit(99);
     }
+
+    if(::arg().mustDo("config")) {
+      cout<<::arg().configstring()<<endl;
+      exit(0);
+    }
+
 
     L.setName("pdns_recursor");