--

diff --git a/perl/Triple.pm b/perl/Triple.pm
index 9857c0b8caffb495dd6df6b0c16db7bdaef3b645..98102b12c73005d4e27a6f7e75a94769413e0ca7 100644 (file)
--- a/perl/Triple.pm
+++ b/perl/Triple.pm
@@ -12,7 +12,8 @@ use Template;
 use URI::Escape;
 
 # Internal
-use Secrets;
+use Triple::Secrets;
+use Triple::Init;
 
 our $debug = 0;
 
@@ -38,8 +39,6 @@ our %page = (
 
 our %static;
 
-our $template = Template->new({INCLUDE_PATH => 'tt'});
-
 sub Triple::main {
 
     sub parse_post {
@@ -54,6 +53,7 @@ sub Triple::main {
 
     my ($sitename, $version) = init();
     my $request = FCGI::Request();
+    my $template = Template->new({INCLUDE_PATH => 'tt'});
 
     my @threads = (
         [
@@ -168,62 +168,11 @@ sub Triple::main {
 }
 
 sub init {
-
-    sub static {
-
-        my ($sitename, $version) = @_;
-        my @boards = (
-            '/c/',
-            '/sys/',
-            );
-        my $vars = {
-            boards       => \@boards,
-            page         => \%Triple::page,
-            sitename     => $sitename,
-            version      => $version,
-        };
-        foreach my $key (keys %page) {
-            my @set = @{$page{$key}};
-           next if $set[PAGE_TYPE] != STATIC_PAGE;
-            syslog("info", "Marking Static '$key'");
-            $vars->{"uri"} = "$key";
-            $vars->{"title"} = "$set[PAGE_TITLE]";
-            $vars->{"description"} = "$set[PAGE_DESCRIPTION]";
-            my $temporary;
-            $template->process($set[PAGE_TT], $vars, \$temporary) or syslog("info", $template->error());
-            $static{$key} = $temporary;
-        }
-    }
-
-    sub sitename {
-
-        use Cwd;
-        my $cwd = getcwd();
-        $cwd =~ s/.*\///;
-        return $cwd;
-    }
-
-    sub debug {
-
-        my $sitename = $_[0];
-        openlog($sitename, "ndelay,pid", Sys::Syslog::LOG_DAEMON);
-        $debug = 1 if $sitename =~ /^test\./;
-    }
-
-    sub version {
-
-        open my $fh, '<', "version" or die "Can't open file: $!";
-        my $line = uc(substr(<$fh>, 0, 12));
-        close $fh;
-        return $line;
-    }
-
-    my $sitename = sitename();
-    debug($sitename);
-    my $version = version();
+    my $sitename = Init::sitename();
+    Init::debug($sitename);
+    my $version = Init::version();
     syslog("info", "<Triple $version>");
-
-    static($sitename, $version);
+    Init::static($sitename, $version);
     return $sitename, $version;
 }
 

diff --git a/perl/Triple/.gitignore b/perl/Triple/.gitignore
new file mode 100644 (file)
index 0000000..a189ecd
--- /dev/null
+++ b/perl/Triple/.gitignore
@@ -0,0 +1 @@
+Secrets.pm

diff --git a/perl/Triple/Init.pm b/perl/Triple/Init.pm
new file mode 100644 (file)
index 0000000..71895df
--- /dev/null
+++ b/perl/Triple/Init.pm
@@ -0,0 +1,51 @@
+sub sitename {
+
+    use Cwd;
+    my $cwd = getcwd();
+    $cwd =~ s/.*\///;
+    return $cwd;
+}
+
+sub debug {
+    use Sys::Syslog;
+
+    my $sitename = $_[0];
+    openlog($sitename, "ndelay,pid", Sys::Syslog::LOG_DAEMON);
+    $debug = 1 if $sitename =~ /^test\./;
+}
+
+sub version {
+
+    open my $fh, '<', "version" or die syslog("info", "Can't open file: $!");
+    my $line = uc(substr(<$fh>, 0, 12));
+    close $fh;
+    return $line;
+}
+
+sub static {
+    my ($sitename, $version) = @_;
+    my $template = Template->new({INCLUDE_PATH => 'tt'});
+    my @boards = (
+        '/c/',
+        '/sys/',
+        );
+    my $vars = {
+        boards       => \@boards,
+        page         => \%Triple::page, # fixme
+        sitename     => $sitename,
+        version      => $version,
+    };
+    foreach my $key (keys %page) {
+        my @set = @{$page{$key}};
+           next if $set[PAGE_TYPE] != STATIC_PAGE;
+        syslog("info", "Marking Static '$key'");
+        $vars->{"uri"} = "$key";
+        $vars->{"title"} = "$set[PAGE_TITLE]";
+        $vars->{"description"} = "$set[PAGE_DESCRIPTION]";
+        my $temporary;
+        $template->process($set[PAGE_TT], $vars, \$temporary) or syslog("info", $template->error());
+        $static{$key} = $temporary;
+    }
+}
+
+1;