Changeset 728

Timestamp:

10/29/06 22:23:03 (2 years ago)

Author:

bradfitz

Message:

expand environment variables

Files:

• trunk/DJabberd-LiveJournal/conf/ljtalk.conf (modified) (1 diff)
• trunk/DJabberd/lib/DJabberd.pm (modified) (2 diffs)

trunk/DJabberd-LiveJournal/conf/ljtalk.conf

@@ -5 +5 @@
-ServerPort 5269
-
-jabber.bradfitz.com
+${ENV:LJ_DOMAIN}
-  S2S true
-  RequireSSL no

trunk/DJabberd/lib/DJabberd.pm

@@ -410 +410 @@
-    my @vhost_stack = ();
-
+    my $expand_var = sub {
+        my ($type, $key) = @_;
+        $type = uc $type;
+
+        if ($type eq "ENV") {
+            # expands ${ENV:KEY} on a line into $ENV{'KEY'} or dies if not defined
+            my $val = $ENV{$key};
+            die "Undefined environment variable '$key'\n" unless defined $val;
+            return $val;
+        }
+        die "Unknown variable type '$type'\n";
+    };
+
-    foreach my $line (split(/\n/, $$configref)) {
-        $linenum++;
@@ -419 +432 @@
-
-        eval {
+            # expand environment variables
+            $line =~ s/\$\{(\w+):(\w+)\}/$expand_var->($1, $2)/eg;
+
-            if ($line =~ /^(\w+)\s+(.+)/) {
-                my $pkey = $1;