Changeset 762

Timestamp:

05/04/06 14:35:45 (6 years ago)

Author:

shibuya

Message:

Addition for custom include named.conf file by C. Hemsing.

Files:

• 5100R/branches/DEV_OpenRaQ/ui/base-dns.mod/Makefile (modified) (1 diff)
• 5100R/branches/DEV_OpenRaQ/ui/base-dns.mod/glue/handlers/dns_generate.pl (modified) (4 diffs)
• 5100R/branches/DEV_OpenRaQ/ui/base-dns.mod/templates/rpmdefs.tmpl (modified) (1 diff)

5100R/branches/DEV_OpenRaQ/ui/base-dns.mod/Makefile

@@ -8 +8 @@
-
-VERSION=1.1.0
-3
+4
-
-# add a buildarch if desired

5100R/branches/DEV_OpenRaQ/ui/base-dns.mod/glue/handlers/dns_generate.pl

@@ -7 +7 @@
-# reminder: the Domain class is defined at the end of this file, and
-# is not separate.
-
+
+
-use strict;
-
@@ -22 +23 @@
-my $named_dir = '/var/named/chroot/var/named';
-my $named_conf = '/var/named/chroot/etc/named.conf';
+my $named_conf_include = '/var/named/chroot/etc/named.conf.include';
-#my $named_link = '/etc/named.conf';
-my $real_dir = '/var/lib/named/etc/named';
@@ -314 +316 @@
-// };
-
+include "/etc/named.conf.include";
+
-$cache_hint
-
@@ -338 +342 @@
-  chmod(0644, $tmpfname);
-  
+  if (!(-e $named_conf_include))
+  {
+    my $fh = new FileHandle(">$named_conf_include");
+    if (!defined($fh))
+     {
+       print STDERR "Couldn't create $named_conf_include: $!\n";
+       return 0;
+     }
+     print $fh "# $named_conf_include\n";
+     print $fh "# user customizations can be added here.\n";
+     $fh->close();
+     chown($named_uid, $named_gid, $named_conf_include);
+     chmod(0644, $named_conf_include);
+  }
+
-  return 1;
-}

5100R/branches/DEV_OpenRaQ/ui/base-dns.mod/templates/rpmdefs.tmpl

@@ -106 +106 @@
-
-<begin $CHANGELOG>
+* Thu May 04 2006 Hisao SHIBUYA <shibuya@alpha.or.jp> 1.1.0-93BQ14
+- Addition for custom include named.conf file by C. Hemsing.
+
-* Tue Nov 29 2005 Hisao SHIBUYA <shibuya@alpha.or.jp> 1.1.0-93BQ13
-- rebuild with devel-tools 0.5.1-0BQ7.