restructured directories

update.sh

@@ -2,14 +2,13 @@
 
 DOMAIN=${SIONA_DOMAIN}
 DIR="/var/www/$DOMAIN"
-DIRDIR="$DIR$DIR"
 
 cd $DIR && ./update_explorer_data.sh
 cd $DIR && ./update_api.sh
 
 # Anonset
-cd $DIRDIR && anonset=$(curl -s "https://$DOMAIN/api/getchaintxstats.json" | jq -r '.shielded_pool_size') && sed -i "s|<span class='anonset'>.*</span>|<span class='anonset'> $anonset </span>|g" template.html
+cd $DIR && anonset=$(curl -s "https://$DOMAIN/api/getchaintxstats.json" | jq -r '.shielded_pool_size') && sed -i "s|<span class='anonset'>.*</span>|<span class='anonset'> $anonset </span>|g" template.html
 
-perl $DIR/bin/update.pl > $DIRDIR/index-1.html
+perl $DIR/bin/update.pl > $DIR/index-1.html
 
-cd $DIRDIR && cat index-1.html > index.html
+cd $DIR && cat index-1.html > index.html

var/www/explorer.dragonx.is/PID

@@ -0,0 +1,12 @@
+226212
+226355
+226361
+226664
+227090
+227309
+227738
+227933
+228039
+228062
+228077
+228090

var/www/explorer.dragonx.is/bin/balances.pl

@@ -10,10 +10,10 @@ my $STATS       = {};
 my $acname      = $ENV{SIONA_ACNAME} || 'DRAGONWX';
 my $ticker      = $acname eq 'HUSH3' ? 'HUSH' : $acname;
 my $domain      = $ENV{SIONA_DOMAIN} || '$domain';
-my $dir         = shift || "/var/www/$domain/var/www/$domain/api";
+my $dir         = shift || "/var/www/$domain/api";
 my $getinfo     = readfile("$dir/getinfo.json");
 my $noprivacy   = readfile("$dir/snapshots/snapshot.json");
-my $template    = readfile("/var/www/$domain/var/www/$domain/addresses/template.html");
+my $template    = readfile("/var/www/$domain/addresses/template.html");
 my @symbols     = qw/ BLOCKS CONNECTIONS TLS_CONNECTIONS TXCOUNT
 					  PROTOCOLVERSION LONGESTCHAIN TIPTIME NOTARIZEDHASH
 					  ADDRESS_DATA TOTAL_ADDRESSES TOTAL AVG UTXOS

var/www/explorer.dragonx.is/bin/update.pl

@@ -10,13 +10,13 @@ sleep 30;
 
 # While Siona swims, we pave with bricks on the road she will run on...
 # my $dir = shift || $ENV{HOME} . "/data";
-my $dir         = shift || '/var/www/explorer.dragonx.is/var/www/explorer.dragonx.is/api';
+my $dir         = shift || '/var/www/explorer.dragonx.is/api';
 my $getinfo     = readfile("$dir/getinfo.json");
 my $mining      = readfile("$dir/getmininginfo.json");
 my $txstats     = readfile("$dir/getchaintxstats.json");
 # run the slowest last so the RPC interface isn't juggling
 my $coinsupply  = readfile("$dir/coinsupply.json");
-my $template    = readfile("/var/www/explorer.dragonx.is/var/www/explorer.dragonx.is/template.html");
+my $template    = readfile("/var/www/explorer.dragonx.is/template.html");
 
 
 #say $template;

var/www/explorer.dragonx.is/bin/update_blocks_redis.pl

@@ -19,12 +19,11 @@ my $acname      = $ENV{SIONA_ACNAME} || 'DRAGONWX';
 my $ticker      = $acname eq 'HUSH3' ? 'HUSH' : $acname;
 my $domain      = $ENV{SIONA_DOMAIN} || 'explorer.dragonx.is';
 my $root        = "/var/www/$domain";
-my $basedir     = "/var/www/$domain/var/www/$domain";
-my $dir         = shift || "$basedir/api";
+my $dir         = shift || "$root/api";
 my $cli         = $ENV{SIONA_CLI} || "/git/hush3/src/hush-cli";
 my $getinfo     = readfile("$dir/getinfo.json");
 my $mining      = readfile("$dir/getmininginfo.json");
-my $blocksdir   = "$basedir/blocks";
+my $blocksdir   = "$root/blocks";
 my $template    = readfile("$blocksdir/template.html");
 if($getinfo     =~ m/"blocks": (\d+)/){ $STATS->{BLOCKS} ||= $1; }
 if($getinfo     =~ m/"tls_connections": (\d+)/){ $STATS->{TLS_CONNECTIONS} ||= $1; }
@@ -57,10 +56,10 @@ for my $h ($height-80 .. $height) {
 	my $hash  = qx!$cli -ac_name=$acname getblockhash $h!;
 	chomp $hash;
 
-	my $blockdir = "$root/var/www/$domain/block/$hash";
+	my $blockdir = "$root/block/$hash";
 	if (!-e "$root/block/$h") {
 			# make /block/HEIGHT work
-			my $cmd = "ln -sf $blockdir $root/var/www/$domain/block/$h";
+			my $cmd = "ln -s $blockdir $root/block/$h";
 			qx{$cmd};
 			warn $cmd;
 	}
@@ -69,7 +68,7 @@ for my $h ($height-80 .. $height) {
 	my $cmd = "mkdir -p $blockdir";
 	qx{$cmd};
 	warn $cmd;
-	my $block_template_file = "$basedir/block/template.html";
+	my $block_template_file = "$root/block/template.html";
 	my $new_block_file      = "$blockdir/index.html";
 	# TODO: process template with block details
 	my $block_template = readfile($block_template_file);
@@ -122,9 +121,9 @@ HTML
 		next if $@;
 
 		$TX->{$tx}                 = $o;
-		my $tx_dir                 = "$root/var/www/$domain/tx/$tx";
-		my $tx_file                = "$root/var/www/$domain/tx/$tx/index.html";
-		my $tx_template_file       = "$root/var/www/$domain/tx/template.html";
+		my $tx_dir                 = "$root/tx/$tx";
+		my $tx_file                = "$root/tx/$tx/index.html";
+		my $tx_template_file       = "$root/tx/template.html";
 		my $tx_template            = readfile($tx_template_file);
 		my $txtime                 = localtime($o->{time});
 		#my $txsize                 = $o->{size} . " bytes";
@@ -338,12 +337,12 @@ sub get_raw {
 
 # render data
 for my $b (reverse @blocks) {
-		my ($height,$hash,$reward,$time,$txs,$miner,$duration) = @$b;
+	my ($height,$hash,$reward,$time,$txs,$miner,$duration) = @$b;
 
-		$time = localtime($time);
+	$time = localtime($time);
 
-		# we can't calc the duration of the first block we look at, yet
-		$duration = "--" unless $duration;
+	# we can't calc the duration of the first block we look at, yet
+	$duration = "--" unless $duration;
 
 $STATS->{BLOCKS_TABLE} .= <<"FUCK";
 <table>
@@ -364,7 +363,7 @@ FUCK
 
 
 for my $s (@symbols) {
-  if($s && $STATS->{$s}) { $template =~ s/#$s#/$STATS->{$s}/ge }
+	if($s && $STATS->{$s}) { $template =~ s/#$s#/$STATS->{$s}/ge }
 }
 
 # derived stat
@@ -383,7 +382,7 @@ sub get_block {
 
 	# create data if it's not there
 	if( $block =~ m/^HASH/ || length($block) == 0 ) {
-	    	my $cmd = "$cli -ac_name=$acname getblock $height";
+		my $cmd = "$cli -ac_name=$acname getblock $height";
 		warn $cmd;
 		$block = qx/$cmd/;
 	}
@@ -402,13 +401,13 @@ sub get_block {
 }
 
 sub readfile {
-  my $file = shift;
-  my $data = "";
-  open(my $fh, '<', $file) or die "$file: $!";
-  my $txlist = 0;
-  while(<$fh>){
-  	$data.=$_ 
-  }
-  close($fh);
-  return $data;
+	my $file = shift;
+	my $data = "";
+	open(my $fh, '<', $file) or die "$file: $!";
+	my $txlist = 0;
+	while(<$fh>){
+		$data.=$_ 
+	}
+	close($fh);
+	return $data;
 }

var/www/explorer.dragonx.is/crons/README

@@ -4,6 +4,8 @@
 # m h  dom mon dow   command
 
 SIONA_DOMAIN=explorer.dragonx.is
+SIONA_CLI=/git/hush3/src/hush-cli
+SIONA_ACNAME=DRAGONWX
 
 */7 * * * * ./update_explorer_data.sh
 */5 * * * * ./update_api.sh

var/www/explorer.dragonx.is/update.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+DOMAIN=explorer.dragonx.is
+
+echo $$ >> $DOMAIN/PID
+
+# make a backup so we can diff them
+cp $DOMAIN/{index,index-prev}.html
+# let index.html settle
+sleep 2
+perl /var/www/explorer.dragonx.is/bin/update.pl /var/www/explorer.dragonx.is/api &> $DOMAIN/index-new.html
+cp $DOMAIN/index-new.html $DOMAIN/index.html

var/www/explorer.dragonx.is/update_api.sh

@@ -5,7 +5,7 @@ DOMAIN=${SIONA_DOMAIN}
 CLI=${SIONA_CLI}
 # this is optional and not used yet here
 ACNAME=${SIONA_ACNAME}
-DIR=/var/www/$DOMAIN/var/www/$DOMAIN/api
+DIR=/var/www/$DOMAIN/api
 
 # TODO: remove IP info from getpeerinfo
 #$CLI  getpeerinfo        > $DIR/getpeerinfo.json

var/www/explorer.dragonx.is/update_explorer_data.sh

@@ -7,8 +7,8 @@ cli=${SIONA_CLI}
 #	HEIGHT=$($cli getblockcount); $cli getblock $HEIGHT > ~/data/blocks/block-$HEIGHT.json
 #fi
 
-NEWFILE=/var/www/$domain/var/www/$domain/blocks/index.new.html
-INDEXFILE=/var/www/$domain/var/www/$domain/blocks/index.html
+NEWFILE=/var/www/$domain/blocks/index.new.html
+INDEXFILE=/var/www/$domain/blocks/index.html
 
 # reads data from /var/www/$domain/api
 /var/www/$domain/bin/update_blocks_redis.pl > $NEWFILE

var/www/explorer.dragonx.is/var/www/explorer.dragonx.is/PID

@@ -1,12 +0,0 @@
-226212
-226355
-226361
-226664
-227090
-227309
-227738
-227933
-228039
-228062
-228077
-228090

var/www/explorer.dragonx.is/var/www/explorer.dragonx.is/update.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-DOMAIN=explorer.dragonx.is/var/www/explorer.dragonx.is
-DIR=/var/www
-
-echo $$ >> $DIR/$DOMAIN/PID
-
-# make a backup so we can diff them
-cp $DIR/$DOMAIN/{index,index-prev}.html
-# let index.html settle
-sleep 2
-perl /var/www/explorer.dragonx.is/bin/update.pl /var/www/explorer.dragonx.is/api &> $DIR/$DOMAIN/index-new.html
-cp $DIR/$DOMAIN/index-new.html $DIR/$DOMAIN/index.html