Merge branch 'master' of ruin.nu:git/ndwebbie

diff --git a/NDWeb/Pages/Main.pm b/NDWeb/Pages/Main.pm
index 8a3233c85b770ceef16bd6d31ab17387d678704a..083b96da133a0fb365905090a9661e197b19ccfa 100644 (file)
--- a/NDWeb/Pages/Main.pm
+++ b/NDWeb/Pages/Main.pm
@@ -209,7 +209,7 @@ sub render_body {
                , f.amount, tick, back
 FROM fleets f 
 LEFT OUTER JOIN current_planet_stats p ON f.target = p.id
-WHERE f.uid = ? AND f.sender = ? AND 
+WHERE NOT ingal AND f.uid = ? AND f.sender = ? AND 
        (back >= ? OR (tick >= tick() -  24 AND name = 'Main'))
 GROUP BY f.id, x,y,z, mission, tick,back,f.amount
 ORDER BY x,y,z,mission,tick

diff --git a/NDWeb/Pages/Raids.pm b/NDWeb/Pages/Raids.pm
index 4b454589af81e11a6bebc19e4bba811a72d39a49..ac1f6b9f936cb2127ef0b30eef885724fdf48b9d 100644 (file)
--- a/NDWeb/Pages/Raids.pm
+++ b/NDWeb/Pages/Raids.pm
@@ -222,9 +222,9 @@ sub render_body {
                        $target{Id} = $target->{id};
                        $target{Race} = $target->{race};
                        my $num = pow(10,length($target->{score})-2);
-                       $target{Score} = ceil($target->{score}/$num)*$num;
+                       $target{Score} = "Hidden"; #ceil($target->{score}/$num)*$num;
                        $num = pow(10,length($target->{value})-2);
-                       $target{Value} = ceil($target->{value}/$num)*$num;
+                       $target{Value} = "Hidden"; #ceil($target->{value}/$num)*$num;
                        $num = pow(10,length($target->{size})-2);
                        $target{Size} = floor($target->{size}/$num)*$num;
                        $num = pow(10,length($target->{fleetvalue})-2);
@@ -282,7 +282,7 @@ sub render_body {
                                $size -= $roids;
                                my $xp = 0;
                                if ($planet){
-                                       $xp = pa_xp($roids,$planet->{score},$planet->{value},$target{Score},$target{Value});
+                                       $xp = pa_xp($roids,$planet->{score},$planet->{value},$target->{score},$target->{value});
                                }
                                push @roids,{Wave => $i, Roids => $roids, XP => $xp};
                                if ($self->{AJAX}){

diff --git a/apache-conf.conf b/apache-conf.conf
index 167819fcaf538059ac1c288e932797f6a544e8ae..998b486101ca843f23abb74ad246618d7c5f3242 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -40,17 +40,14 @@
 
 <VirtualHost *:80>
        ServerName nd.ruin.nu
-       ServerAlias webbie.ndawn.com
 
        RewriteEngine On
         RewriteCond %{HTTPS} !=on
-       RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R]
+       RewriteRule ^/(.*) https://%{SERVER_NAME}:1337%{REQUEST_URI} [R]
 </VirtualHost>
 
 <VirtualHost *:443>
-
        ServerName nd.ruin.nu
-       ServerAlias webbie.ndawn.com
 
        ErrorLog /var/log/apache2/ndawn_error_log
        <IfModule mod_log_config.c>
@@ -151,3 +148,114 @@
     </IfModule>
 </VirtualHost>
 
+Listen 1337
+
+<VirtualHost *:1337>
+       ServerName nd.ruin.nu
+
+       ErrorLog /var/log/apache2/ndawn_error_log
+       <IfModule mod_log_config.c>
+               #TransferLog logs/ndawn_access_log
+               CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\""
+       </IfModule>
+
+
+       SSLEngine on
+       SSLCertificateFile /etc/apache2/ssl/nd.crt
+       SSLCertificateKeyFile /etc/apache2/ssl/nd.key
+       #SSLCertificateChainFile /etc/apache2/ssl/ca-bundle.crt
+       #SSLCACertificateFile /etc/apache2/ssl/ca-bundle.crt
+
+       <IfModule setenvif_module>
+               BrowserMatch ".*MSIE.*" \
+                       nokeepalive ssl-unclean-shutdown \
+                       downgrade-1.0 force-response-1.0
+       </IfModule>
+    #
+    # DocumentRoot: The directory out of which you will serve your
+    # documents. By default, all requests are taken from this directory, but
+    # symbolic links and aliases may be used to point to other locations.
+    #
+    DocumentRoot "/var/www/ndawn/htdocs"
+
+       DeflateFilterNote ratio
+       AddOutputFilterByType DEFLATE text/*
+       AddOutputFilterByType DEFLATE application/xhtml+xml
+       AddOutputFilterByType DEFLATE application/ms* application/vnd* application/postscript
+
+
+    #
+    # This should be changed to whatever you set DocumentRoot to.
+    #
+    <Directory "/var/www/ndawn/htdocs">
+
+        #
+        # Possible values for the Options directive are "None", "All",
+        # or any combination of:
+        #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+        #
+        # Note that "MultiViews" must be named *explicitly* --- "Options All"
+        # doesn't give it to you.
+        #
+        # The Options directive is both complicated and important.  Please see
+        # http://httpd.apache.org/docs-2.0/mod/core.html#options
+        # for more information.
+        #
+        Options Indexes FollowSymLinks
+
+        #
+        # AllowOverride controls what directives may be placed in .htaccess files.
+        # It can be "All", "None", or any combination of the keywords:
+        #   Options FileInfo AuthConfig Limit
+        #
+        AllowOverride None
+    </Directory>
+       <Location />
+
+       AuthName "NewDawn authentication"
+       AuthType basic
+
+       PerlAuthenHandler NDWeb::AuthHandler
+
+       Order Deny,Allow
+       Require valid-user
+
+       </Location>
+
+
+    # Disallow browsing of Subversion working copy administrative dirs.  
+    <locationmatch "/.svn/>  
+       Order allow,deny  
+       Deny from all  
+    </locationmatch> 
+    <Location .*/\.svn/.*>
+       Order allow,deny  
+       Deny from all  
+    </Location>
+
+       PerlSwitches -T -I/var/www/ndawn/
+       PerlRequire /var/www/ndawn/startup.pl
+       <Location ~ "^/((\w+\.(pl|php|pm))|[^.]*)$">
+               SetHandler perl-script
+               PerlResponseHandler ND
+       </Location>
+
+       <Location /perl-status>
+               SetHandler perl-script
+               PerlResponseHandler Apache2::Status
+               Order deny,allow
+               Deny from all
+               Allow from 127.0.0.1
+               Allow from 193.11.248.227
+       </Location>
+
+       
+    <IfModule peruser.c>
+        # this must match a Processor
+        ServerEnvironment apache apache
+        
+        # these are optional - defaults to the values specified in httpd.conf
+        MinSpareProcessors 4
+        MaxProcessors 20
+    </IfModule>
+</VirtualHost>

diff --git a/scripts/fetchdumps.pl b/scripts/fetchdumps.pl
index b8be1c36ca111561d5054337d18ecba75fc84b9b..65942b76951038003058f3f7f8e9bb892259b374 100755 (executable)
--- a/scripts/fetchdumps.pl
+++ b/scripts/fetchdumps.pl
@@ -42,7 +42,7 @@ for my $type ("planet","alliance","galaxy"){
        $select->execute($type,$head[2]);
        unless ($select->fetchrow){
                my $file = get("http://game.planetarion.com/botfiles/${type}_listing.txt");
-               if ($file =~ /Tick: (\d+)/){
+               if (defined $file && $file =~ /Tick: (\d+)/){
                        $updated = $1;
                        $insert->execute($1,$type,$head[2],$file);
                }
@@ -50,10 +50,11 @@ for my $type ("planet","alliance","galaxy"){
        $select->finish;
 }
 
-if ($updated){
+if ($updated > 36){
        `/var/www/ndawn/scripts/parsedumps.pl $updated`;
        `/var/www/ndawn/scripts/ndrank.pl`;
-       $dbh->do("UPDATE misc SET value = ? WHERE id = 'TICK'", undef, $updated);
+       $dbh->do(q{UPDATE misc SET value = ? WHERE id = 'TICK'}, undef, $updated);
+       $dbh->do(q{VACUUM ANALYZE});
 }