Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • nodl-private/nodl-admin-private
  • snapshit/nodl-admin-private
2 results
Show changes
Commits on Source (29)
Hide whitespace changes
Inline Side-by-side
Showing
with 209 additions and 127 deletions
bin/nodl-installer.php
View file @ bbf17711
......@@ -16,21 +16,20 @@ if(!$db) {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'end of mysqli_connect');
// ver.box.beta.lightning-solutions.eu
$version_dns = 'ver.box.lightning-solutions.eu';
$version_dns = 'nonexistent.ver.box.lightning-solutions.eu';
$version_dns_rel = '';
$version_dns_suffix = 'box.lightning-solutions.eu';
$version_next = 'master';
$version_notes = Array();
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'checking available version...');
switch($nodl_strain) {
case 'alpha':
$version_dns = 'ver.box.alpha.lightning-solutions.eu';
break;
case 'beta':
$version_dns = 'ver.box.beta.lightning-solutions.eu';
break;
case 'gamma':
case 'nodl-dojo-dev':
case 'nodl-dojo':
$version_dns = $nodl_strain.'.ver.'.$version_dns_suffix;
$version_dns_rel = $nodl_strain.'.rel.'.$version_dns_suffix;
break;
default:
$version_dns = 'ver.box.nonexistent.lightning-solutions.eu';
$version_next = $nodl_strain;
break;
}
......@@ -43,10 +42,20 @@ if(isset($dns[0]['txt'])) {
$version_next = $dns[0]['txt'];
}
$dns = dns_get_record($version_dns_rel, DNS_TXT);
foreach($dns as $answer) {
if(isset($answer['txt'])) {
$version_notes[] = $answer['txt'];
}
}
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Next version for strain '.$nodl_strain.' is '.$version_next.'.');
$db->query('DELETE FROM config WHERE name=\'version_next\'');
$db->query('INSERT INTO config(name,value) VALUES(\'version_next\',\''.$db->real_escape_string($version_next).'\');');
$db->query("INSERT INTO config(name,value) VALUES('version_next','".$db->real_escape_string($version_next)."') ON DUPLICATE KEY UPDATE value='".$db->real_escape_string($version_next)."';");
if(sizeof($version_notes)>0) {
$db->query("INSERT INTO config(name,value) VALUES('version_notes','".$db->real_escape_string(serialize($version_notes))."') ON DUPLICATE KEY UPDATE value='".$db->real_escape_string(serialize($version_notes))."';");
}
// Check if update was requested
$res = $db->query('SELECT name,value FROM config WHERE name=\'nodl_update\'');
......@@ -59,8 +68,8 @@ if($row = $res->fetch_assoc()) {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Triggering nodl update to version '.$version_next.'...');
exec('chmod +x /usr/share/nodl/update-nodl.sh');
if('alpha' != $nodl_strain) {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Checking out tag '.$version_next.'...');
exec('/usr/share/nodl/update-nodl.sh '.$version_next,$values,$return);
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Checking out tag '.$nodl_strain.'...');
exec('/usr/share/nodl/update-nodl.sh '.$nodl_strain,$values,$return);
} else {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Jumping to branch alpha...');
exec('/usr/share/nodl/update-nodl.sh alpha',$values,$return);
......@@ -115,9 +124,25 @@ if(!$row = $res->fetch_assoc()) {
$db->query("INSERT INTO config(name,value) VALUES('version','v0.1.0') ON DUPLICATE KEY UPDATE value='v0.1.0';");
$db->query("INSERT INTO config(name,value) VALUES('version'_top,'v0.1.0') ON DUPLICATE KEY UPDATE value='v0.1.0';");
syslog(LOG_INFO, "Done");
case 'v0.1.0':
syslog(LOG_INFO, "Upgrading database to v0.1.1");
$db->query("INSERT INTO config(name,value) VALUES('version','v0.1.1') ON DUPLICATE KEY UPDATE value='v0.1.1';");
$db->query("INSERT INTO config(name,value) VALUES('version'_top,'v0.1.1') ON DUPLICATE KEY UPDATE value='v0.1.1';");
syslog(LOG_INFO, "Done");
case 'v0.1.1':
case 'v0.1.1b':
syslog(LOG_INFO, "Upgrading database to v0.1.1c");
$db->query("INSERT INTO config(name,value) VALUES('version','v0.1.1c') ON DUPLICATE KEY UPDATE value='v0.1.1c';");
$db->query("INSERT INTO config(name,value) VALUES('version'_top,'v0.1.1c') ON DUPLICATE KEY UPDATE value='v0.1.1c';");
syslog(LOG_INFO, "Done");
case 'v0.1.1c':
syslog(LOG_INFO, "Upgrading database to v0.1.1d");
$db->query("INSERT INTO config(name,value) VALUES('version','v0.1.1d') ON DUPLICATE KEY UPDATE value='v0.1.1d';");
$db->query("INSERT INTO config(name,value) VALUES('version'_top,'v0.1.1d') ON DUPLICATE KEY UPDATE value='v0.1.1d';");
syslog(LOG_INFO, "Done");
exit(0);
break;
case 'v0.1.0': // OK
break;
case 'v0.1.1d': // OK
break;
default: // unknown version
exit(0);
......
bin/nodl-service.php
View file @ bbf17711
......@@ -315,7 +315,7 @@ addnode=5tuxetn7tar3q5kp.onion'; break;
if($service_tor_restart) {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'restarting tor');
exec('pgrep tor && service tor restart');
exec('pgrep -u debian-tor tor && service tor restart');
}
if($service_bitcoind_restart) {
......@@ -446,7 +446,7 @@ while($row = $res->fetch_assoc()) {
}
break;
case 'tor':
if($tor_pid = exec('pgrep tor')) {
if($tor_pid = exec('pgrep -u debian-tor tor')) {
} else {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.str_replace('_status','',$row['name']).' should be running but is not, starting.');
exec('systemctl enable '.str_replace('_status','',$row['name']));
......@@ -608,7 +608,7 @@ foreach($bitcoind as $name => $value) {
$tor['status'] = 0;
if($tor_pid = exec('pgrep tor')) {
if($tor_pid = exec('pgrep -u debian-tor tor')) {
$tor['status'] = 2;
// list hidden services to show in UI
//$tor_hs_whitelist = ['tor_bitcoind_rpc', 'tor_lnd_rest', 'tor_lnd_grpc', 'tor_electrum', 'tor_http'];
......@@ -971,51 +971,63 @@ if($lnd_pid = exec('pgrep lnd')) {
$lnd['unlock'] = $lnd_rpc->testunlock();
}
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Checking for IP');
$res1 = $db->query('SELECT value FROM config WHERE name=\'lnd_externalip\'');
if($row1 = $res1->fetch_assoc()) {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Got a public IPv4 in the database: '.$row1['value']);
$res2 = $db->query('SELECT value FROM config WHERE name=\'lnd_externalip\' AND (dt + INTERVAL 10 MINUTE < NOW() OR value!=\''.$lnd_public_ip.'\')');
if($row2 = $res2->fetch_assoc()) {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Getting a new IP'); // got old IP
if($ip = json_decode(file_get_contents('https://api.ipify.org?format=json'), 'true')['ip']) {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Got an IP '.$ip.' and old ip is '.$row2['value']);
if($ip != $row2['value']) {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.' Got a new IP');
$db->query("UPDATE config SET value='".$ip."',dt=NOW() WHERE name='lnd_externalip'");
file_put_contents('/etc/nodl/publicip', 'PUBLICIP='.$ip);
$db->query('DELETE FROM config WHERE name=\'nodl_config\';');
$db->query('INSERT INTO config(name,value) VALUES(\'nodl_config\',\'1\');');
//exec('service lnd restart');
$lnd_tor_active = '1';
$res0 = $db->query("SELECT value FROM config WHERE name'lnd_tor_active'");
if($value = $res0->fetch_array()) {
$lnd_tor_active = ('true'===$value['value'])?'1':'0';
}
$res0->free_result();
if('1'===$lnd_tor_active) {
$db->query("UPDATE config SET value='127.0.0.1',dt=NOW() WHERE name='lnd_externalip'");
file_put_contents('/etc/nodl/publicip', 'PUBLICIP=127.0.0.1');
} else {
$res1 = $db->query('SELECT value FROM config WHERE name=\'lnd_externalip\'');
if($row1 = $res1->fetch_assoc()) {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Got a public IPv4 in the database: '.$row1['value']);
$res2 = $db->query('SELECT value FROM config WHERE name=\'lnd_externalip\' AND (dt + INTERVAL 10 MINUTE < NOW() OR value!=\''.$lnd_public_ip.'\')');
if($row2 = $res2->fetch_assoc()) {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Getting a new IP'); // got old IP
if($ip = json_decode(file_get_contents('https://api.ipify.org?format=json'), 'true')['ip']) {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Got an IP '.$ip.' and old ip is '.$row2['value']);
if($ip != $row2['value']) {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.' Got a new IP');
$db->query("UPDATE config SET value='".$ip."',dt=NOW() WHERE name='lnd_externalip'");
file_put_contents('/etc/nodl/publicip', 'PUBLICIP='.$ip);
$db->query('DELETE FROM config WHERE name=\'nodl_config\';');
$db->query('INSERT INTO config(name,value) VALUES(\'nodl_config\',\'1\');');
//exec('service lnd restart');
} else {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Public IP didn\'t change');
}
} else {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Public IP didn\'t change');
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Failed getting public IP');
}
} else {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'Failed getting public IP');
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'No change in public IP or public IP updated less than 10 minutes...');
}
$res2->free_result();
} else { // no value yet
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '."No public IP recorded yet...");
$apify = json_decode(file_get_contents('https://api.ipify.org?format=json'), 'true');
//print_r(__FILE__.'('.__LINE__.') '.$apify);
if($apify['ip']) {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.' Updating public IP');
$ip = $apify['ip'];
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'INSERT INTO config(name,value) VALUES(\'lnd_externalip\',\''.$ip.'\')');
$db->query('INSERT INTO config(name,value) VALUES(\'lnd_externalip\',\''.$ip.'\')');
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.$db->error);
file_put_contents('/etc/nodl/publicip', 'PUBLICIP='.$ip);
$db->query('DELETE FROM config WHERE name=\'nodl_config\';');
$db->query('INSERT INTO config(name,value) VALUES(\'nodl_config\',\'1\');');
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') Restarting lnd...');
// exec('service lnd restart');
} else {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '."Failed getting public IP");
}
} else {
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'No change in public IP or public IP updated less than 10 minutes...');
}
$res2->free_result();
} else { // no value yet
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '."No public IP recorded yet...");
$apify = json_decode(file_get_contents('https://api.ipify.org?format=json'), 'true');
//print_r(__FILE__.'('.__LINE__.') '.$apify);
if($apify['ip']) {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.' Updating public IP');
$ip = $apify['ip'];
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.'INSERT INTO config(name,value) VALUES(\'lnd_externalip\',\''.$ip.'\')');
$db->query('INSERT INTO config(name,value) VALUES(\'lnd_externalip\',\''.$ip.'\')');
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '.$db->error);
file_put_contents('/etc/nodl/publicip', 'PUBLICIP='.$ip);
$db->query('DELETE FROM config WHERE name=\'nodl_config\';');
$db->query('INSERT INTO config(name,value) VALUES(\'nodl_config\',\'1\');');
// syslog(LOG_INFO, __FILE__.'('.__LINE__.') Restarting lnd...');
// exec('service lnd restart');
} else {
syslog(LOG_INFO, __FILE__.'('.__LINE__.') '."Failed getting public IP");
}
$res1->free_result();
}
$res1->free_result();
}
}
......
bin/whirlpool-client-cli-0.10.6-run.jar → bin/whirlpool-client-cli-0.10.8-run.jar
View file @ bbf17711
No preview for this file type
bin/whirlpool.sh
View file @ bbf17711
......@@ -6,4 +6,4 @@
touch /var/log/whirlpool-cli.log
touch /var/log/whirlpool-cli.err
chown whirlpool /var/log/whirlpool-cli.log /var/log/whirlpool-cli.err
daemonize -c /opt/whirlpool -e /var/log/whirlpool-cli.err -o /var/log/whirlpool-cli.log /usr/bin/java -jar /usr/local/bin/whirlpool-client-cli-0.10.6-run.jar --listen
daemonize -c /opt/whirlpool -e /var/log/whirlpool-cli.err -o /var/log/whirlpool-cli.log /usr/bin/java -jar /usr/local/bin/whirlpool-client-cli-0.10.8-run.jar --listen
install.sh
View file @ bbf17711
......@@ -67,6 +67,8 @@ chmod +x /etc/init.d/*
apt-key add /usr/share/nodl/files/nodesource.gpg.key
gpg --keyserver hkp://keyserver.ubuntu.com --refresh-keys
VERSION=node_12.x
DISTRO="$(lsb_release -s -c)"
echo "deb https://deb.nodesource.com/$VERSION $DISTRO main" | sudo tee /etc/apt/sources.list.d/nodesource.list
......@@ -89,7 +91,7 @@ if [ ! -e /opt/btc-rpc-explorer ]; then
useradd -d /opt/btc-rpc-explorer -s /bin/bash -m btc-rpc-explorer
fi
if [ ! -e /opt/bitcoind-0.20.0 ] ; then
if [ ! -e /opt/bitcoind-0.20.1 ] ; then
echo "upgrading bitcoind" > /tmp/upgrade
if [ $bitcoind_run -eq 1 ] ; then
marianodl=$(</etc/nodl/maria-nodl.pwd)
......@@ -104,7 +106,7 @@ if [ ! -e /opt/bitcoind-0.20.0 ] ; then
fi
fi
if [ ! -e /opt/lnd-0.10.1 ] ; then
if [ ! -e /opt/lnd-0.10.4 ] ; then
echo "upgrading lnd" > /tmp/upgrade
if [ $lnd_run -eq 1 ] ; then
marianodl=$(</etc/nodl/maria-nodl.pwd)
......@@ -113,14 +115,13 @@ if [ ! -e /opt/lnd-0.10.1 ] ; then
sleep 15
fi
/usr/share/nodl/install-lnd.sh
touch /opt/lnd-0.10.1
if [ $lnd_run -eq 1 ] ; then
marianodl=$(</etc/nodl/maria-nodl.pwd)
echo "INSERT INTO config(name,value) VALUES('lnd_status','201') ON DUPLICATE KEY UPDATE value='201';" | mysql -u nodladmin -p$marianodl nodladmin
fi
fi
if [ ! -e /opt/rtl-0.7.1 ] || [ ! -e /opt/bitcoin/RTL/node_modules ] ; then
if [ ! -e /opt/rtl-0.8.4 ] || [ ! -e /opt/bitcoin/RTL/node_modules ] ; then
echo "upgrading rtl" > /tmp/upgrade
if [ $rtl_run -eq 1 ] ; then
marianodl=$(</etc/nodl/maria-nodl.pwd)
......@@ -129,8 +130,6 @@ if [ ! -e /opt/rtl-0.7.1 ] || [ ! -e /opt/bitcoin/RTL/node_modules ] ; then
sleep 15
fi
/usr/share/nodl/install-rtl.sh
rm /opt/bitcoin/RTL/RTL-Config.json
touch /opt/rtl-0.7.1
if [ $rtl_run -eq 1 ] ; then
marianodl=$(</etc/nodl/maria-nodl.pwd)
echo "INSERT INTO config(name,value) VALUES('rtl_status','201') ON DUPLICATE KEY UPDATE value='201';" | mysql -u nodladmin -p$marianodl nodladmin
......@@ -169,7 +168,7 @@ if [ ! -e /opt/btcpay-1.0.4.4 ] ; then
fi
if [ $whirlpool_run -eq 1 ] ; then
if [ ! -e /opt/whirlpool-0.10.6 ] ; then
if [ ! -e /opt/whirlpool-0.10.8 ] ; then
echo "upgrading and restarting whirlpool CLI" > /tmp/upgrade
service whirlpool stop
killall -u whirlpool java
......@@ -177,7 +176,7 @@ if [ $whirlpool_run -eq 1 ] ; then
killall -9 -u whirlpool java
sleep 2
service whirlpool start
touch /opt/whirlpool-0.10.6
touch /opt/whirlpool-0.10.8
fi
fi
......
share/files/RTL-Config.json 0 → 100644
View file @ bbf17711
{
"port": 3000,
"host": "localhost",
"defaultNodeIndex": 1,
"SSO": {
"rtlSSO": "0",
"rtlCookiePath": "",
"logoutRedirectLink": "/login"
},
"nodes": [
{
"index": 1,
"lnNode": "nodl",
"lnImplementation": "LND",
"Authentication": {
"macaroonPath": "/opt/bitcoin/.lnd/data/chain/bitcoin/mainnet/",
"configPath": "/opt/bitcoin/.lnd/"
},
"Settings": {
"userPersona": "OPERATOR",
"enableLogging": false,
"fiatConversion": false,
"themeMode": "NIGHT",
"themeColor": "INDIGO",
"currencyUnit": "USD",
"lnServerUrl": "https://localhost:8090/v1"
}
}
],
"multiPass": "RTLPWD"
}
share/files/RTL.tgz deleted 100644 → 0
View file @ 1cfb7c71
File deleted
share/files/config-RTL.conf deleted 100644 → 0
View file @ 1cfb7c71
[Authentication]
lndServerUrl=https://localhost:8090/v1
macroonPath=/opt/bitcoin/.lnd/data/chain/bitcoin/mainnet/
nodeAuthType=CUSTOM
lndConfigPath=/opt/bitcoin/.lnd/
rtlPass=RTLPWD
[SSO]
rtlSSO=0
rtlCookiePath=
logoutRedirectLink=/login
[Settings]
userPersona=OPERATOR
themeMode=NIGHT
themeColor=INDIGO
currencyUnit=USD
flgSidenavOpened=true
flgSidenavPinned=true
menu=VERTICAL
menuType=REGULAR
fontSize=MEDIUM
satsToBTC=false
share/install-bitcoind.sh
View file @ bbf17711
......@@ -16,16 +16,16 @@ mkdir -p /opt/tmp
cd /opt/tmp || exit 100
rm -rf *
wget -q https://bitcoin.org/bin/bitcoin-core-0.20.0/bitcoin-0.20.0-aarch64-linux-gnu.tar.gz || exit 1
wget -q https://bitcoin.org/bin/bitcoin-core-0.20.0/SHA256SUMS.asc || exit 1
wget -q https://bitcoincore.org/bin/bitcoin-core-0.20.1/bitcoin-0.20.1-aarch64-linux-gnu.tar.gz || exit 1
wget -q https://bitcoincore.org/bin/bitcoin-core-0.20.1/SHA256SUMS.asc|| exit 1
gpg --import /usr/share/nodl/files/laanwj-releases.asc || exit 2
sha256sum --check SHA256SUMS.asc --ignore-missing || exit 2
gpg --verify SHA256SUMS.asc || exit 2
tar zxf bitcoin-0.20.0-aarch64-linux-gnu.tar.gz || exit 3
tar zxf bitcoin-0.20.1-aarch64-linux-gnu.tar.gz || exit 3
install -m 0755 -o root -g root -t /usr/local/bin bitcoin-0.20.0/bin/* || exit 3
install -m 0755 -o root -g root -t /usr/local/bin bitcoin-0.20.1/bin/* || exit 3
useradd -d /opt/bitcoin -s /bin/bash -m bitcoin
mkdir -p /opt/bitcoin/.bitcoin
......@@ -53,10 +53,10 @@ sed -e "s/BITCOINRPCPASS/$bitcoindrpc/" -i /opt/bitcoin/.bitcoin/bitcoin.conf
echo "DELETE FROM config WHERE name='bitcoind_curversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "DELETE FROM status WHERE name='bitcoind_curversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "DELETE FROM status WHERE name='bitcoind_nextversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('bitcoind_curversion','v0.20.0')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('bitcoind_curversion','s:7:\"v0.20.0\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('bitcoind_nextversion','s:7:\"v0.20.0\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('bitcoind_curversion','v0.20.1')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('bitcoind_curversion','s:7:\"v0.20.1\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('bitcoind_nextversion','s:7:\"v0.20.1\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('bitcoind_status','1') ON DUPLICATE KEY UPDATE value='1';" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('nodl_config','1') ON DUPLICATE KEY UPDATE value='1'" | mysql -u nodladmin -p$marianodl nodladmin
touch /opt/bitcoind-0.20.0
touch /opt/bitcoind-0.20.1
exit 0
share/install-lnd.sh
View file @ bbf17711
......@@ -13,18 +13,18 @@ mkdir -p /opt/tmp
cd /opt/tmp || exit 100
rm -rf *
wget -q https://github.com/lightningnetwork/lnd/releases/download/v0.10.1-beta/lnd-linux-arm64-v0.10.1-beta.tar.gz || exit 1
wget -q https://github.com/lightningnetwork/lnd/releases/download/v0.10.1-beta/manifest-v0.10.1-beta.txt || exit 1
wget -q https://github.com/lightningnetwork/lnd/releases/download/v0.10.1-beta/manifest-v0.10.1-beta.txt.sig || exit 1
wget -q https://github.com/lightningnetwork/lnd/releases/download/v0.10.4-beta/lnd-linux-arm64-v0.10.4-beta.tar.gz || exit 1
wget -q https://github.com/lightningnetwork/lnd/releases/download/v0.10.4-beta/manifest-v0.10.4-beta.txt || exit 1
wget -q https://github.com/lightningnetwork/lnd/releases/download/v0.10.4-beta/manifest-v0.10.4-beta.txt.sig || exit 1
gpg --import /usr/share/nodl/files/halseth-releases.asc || exit 2
gpg --import /usr/share/nodl/files/roasbeef-releases.asc || exit 2
sha256sum --check manifest-v0.10.1-beta.txt --ignore-missing || exit 2
gpg --verify manifest-v0.10.1-beta.txt.sig || exit 2
sha256sum --check manifest-v0.10.4-beta.txt --ignore-missing || exit 2
gpg --verify manifest-v0.10.4-beta.txt.sig || exit 2
tar zxf lnd-linux-arm64-v0.10.1-beta.tar.gz
tar zxf lnd-linux-arm64-v0.10.4-beta.tar.gz
install -m 0755 -o root -g root -t /usr/local/bin lnd-linux-arm64-v0.10.1-beta/*
install -m 0755 -o root -g root -t /usr/local/bin lnd-linux-arm64-v0.10.4-beta/*
mkdir -p /opt/bitcoin/.lnd
cp /usr/share/nodl/files/lnd.conf.new /opt/bitcoin/.lnd/lnd.conf || exit 3
......@@ -39,10 +39,12 @@ export marianodl=$(</etc/nodl/maria-nodl.pwd)
echo "DELETE FROM config WHERE name='lnd_curversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "DELETE FROM status WHERE name='lnd_curversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "DELETE FROM status WHERE name='lnd_nextversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('lnd_curversion','v0.10.1')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('lnd_curversion','s:6:\"v0.10.1\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('lnd_nextversion','s:6:\"v0.10.1\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('lnd_curversion','v0.10.4')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('lnd_curversion','s:6:\"v0.10.4\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('lnd_nextversion','s:6:\"v0.10.4\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('lnd_status','1') ON DUPLICATE KEY UPDATE value='1';" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('nodl_config','1') ON DUPLICATE KEY UPDATE value='1'" | mysql -u nodladmin -p$marianodl nodladmin
touch /opt/lnd-0.10.4
exit 0
share/install-rtl.sh
View file @ bbf17711
......@@ -13,12 +13,12 @@ chmod 600 /etc/nodl/rtl-ui.pwd
rtl=$(</etc/nodl/rtl-ui.pwd)
sed -e "s/RTLPWD/$rtl/" -i /usr/share/nodl/files/config-RTL.conf
sed -e "s/RTLPWD/$rtl/" -i /usr/share/nodl/files/RTL-Config.json
sudo -H -u bitcoin bash -c "rm -rf /opt/bitcoin/RTL.old"
sudo -H -u bitcoin bash -c "mv /opt/bitcoin/RTL /opt/bitcoin/RTL.old"
sudo -H -u bitcoin bash -c "cd /opt/bitcoin ; git clone https://github.com/ShahanaFarooqui/RTL"
sudo -H -u bitcoin bash -c "cd /opt/bitcoin/RTL ; git checkout v0.7.1 ; npm install"
sudo -H -u bitcoin bash -c "cd /opt/bitcoin/RTL ; git checkout v0.8.4 ; npm install"
sudo -H -u bitcoin bash -c "cd /opt/bitcoin/RTL ; pm2 start rtl.js"
sudo -H -u bitcoin bash -c "cd /opt/bitcoin/RTL ; pm2 install pm2-logrotate"
sudo -H -u bitcoin bash -c "cd /opt/bitcoin/RTL ; pm2 dump"
......@@ -29,19 +29,20 @@ mv /etc/init.d/pm2-bitcoin /etc/init.d/pm2-rtl
sudo -H -u bitcoin bash -c "cd /opt/bitcoin/RTL ; pm2 kill"
cp /usr/share/nodl/files/config-RTL.conf /opt/bitcoin/RTL/RTL.conf
rm /opt/bitcoin/RTL/RTL-Config.json
chown bitcoin:bitcoin /opt/bitcoin/RTL/RTL.conf
sleep 2
cp /usr/share/nodl/files/RTL-Config.json /opt/bitcoin/RTL/RTL-Config.json
chown bitcoin:bitcoin /opt/bitcoin/RTL/RTL-Config.json
export marianodl=$(</etc/nodl/maria-nodl.pwd)
echo "DELETE FROM config WHERE name='rtl_curversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "DELETE FROM status WHERE name='rtl_curversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "DELETE FROM status WHERE name='rtl_nextversion'" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('rtl_curversion','v0.7.1')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('rtl_curversion','s:6:\"v0.7.1\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('rtl_nextversion','s:6:\"v0.7.1\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('rtl_curversion','v0.8.4')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('rtl_curversion','s:6:\"v0.8.4\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO status(name,value) VALUES('rtl_nextversion','s:6:\"v0.8.4\";')" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('rtl_status','1') ON DUPLICATE KEY UPDATE value='1';" | mysql -u nodladmin -p$marianodl nodladmin
echo "INSERT INTO config(name,value) VALUES('nodl_config','1') ON DUPLICATE KEY UPDATE value='1'" | mysql -u nodladmin -p$marianodl nodladmin
touch /opt/rtl-0.7.1
touch /opt/rtl-0.8.4
exit 0
www/changelog.txt
View file @ bbf17711
0.1.1d - maintenance release
- Display release notes for next version in UI
- bitcoind 0.20.1
- LND 0.10.4
- RTL 0.8.4
0.1.1c - maintenance release
- Whirlpool CLI 0.10.8
0.1.1b - maintenance release
- Whirlpool CLI 0.10.7
0.1.1 - upgrade (nodl Dojo and nodl One)
- Whirlpool CLI 0.10.6
- bitcoind 0.20.0
- Electrs 0.8.5
- LND 0.10.1
- RTL 0.7.1
0.1.0 - upgrade (nodl Dojo and nodl One)
- BTCPayServer 1.0.4.4
- Hidden service to access btc-rpc-explorer only
......
www/inc/database.php
View file @ bbf17711
......@@ -9,13 +9,14 @@ $version = 'version unknown';
$version_next = '';
$strain = '';
$bad_pwd = '';
$version_notes = Array();
$db = mysqli_connect ($db_host, $db_user, $db_pass, $db_name);
if(!$db) {
$errormsg = "Can't connect to the database";
}
$res = $db->query('SELECT name,value FROM config WHERE name IN (\'strain\',\'version_next\',\'version\',\'batch\',\'serial\')');
$res = $db->query("SELECT name,value FROM config WHERE name IN ('strain','version_next','version_notes','version','batch','serial')");
while($row = $res->fetch_assoc()) {
switch($row['name']) {
case 'version':
......@@ -30,6 +31,9 @@ while($row = $res->fetch_assoc()) {
case 'version_next':
$version_next = $row['value'];
break;
case 'version_notes':
$version_notes = unserialize($row['value']);
break;
case 'strain':
$strain = $row['value'];
break;
......
www/pages/status.php
View file @ bbf17711
......@@ -148,13 +148,13 @@ $services[]['name'] = 'tor';
//$services[]['name'] = 'tincd';
//$services[]['name'] = 'iodine';
$pretty['bitcoind'] = 'Bitcoin v0.20.0';
$pretty['lnd'] = 'LND v0.10.1-beta';
$pretty['bitcoind'] = 'Bitcoin v0.20.1';
$pretty['lnd'] = 'LND v0.10.4-beta';
$pretty['dojo'] = 'Dojo nodl edition';
$pretty['rtl'] = 'Ride The Lightning v0.7.1';
$pretty['rtl'] = 'Ride The Lightning v0.8.4';
$pretty['tor'] = 'Tor';
$pretty['btcpay'] = 'BTCPay Server v1.0.4.4';
$pretty['whirlpool'] = 'Whirlpool CLI v0.10.6';
$pretty['whirlpool'] = 'Whirlpool CLI v0.10.8';
$pretty['electrs'] = 'Electrum Rust Server v0.8.5';
$pretty['btc-rpc-explorer'] = 'btc-rpc-explorer v2.0.0';
......@@ -186,18 +186,30 @@ $res->free_result();
<?php
$breed = '';
switch($version) { // https://en.wikipedia.org/wiki/List_of_cattle_breeds
case 'v0.0.9': $breed = ' (Aberdeen Angus)'; break;
case 'v0.1.0': $breed = ' (Abergele)' ; break;
case 'v0.0.9': $breed = ' (Aberdeen Angus)'; break;
case 'v0.1.0': $breed = ' (Abergele)' ; break;
case 'v0.0.1':
case 'v0.1.1b':
case 'v0.1.1c':
case 'v0.1.1d': $breed = ' (Abigar)' ; break;
}
echo('<p>Current version: '.$version.$breed.'');
if(isset($version_next) && strlen($version_next)>2 && $version_next>$version) {
echo('&nbsp;-&nbsp;Available version: '.$version_next);
}
echo('&nbsp;-&nbsp;<a href="./changelog.txt" class="card-link" target="_blank" rel="noopener noreferrer">Change log</a>');
if(isset($strain) && strlen($strain)>2) {
echo('&nbsp;-&nbsp;branch: '.$strain);
}
echo('</p>');
if(isset($version_next) && strlen($version_next)>2 && $version_next>$version) {
echo('<p>Available version: '.$version_next.', release notes:');
if(sizeof($version_notes)>0) {
echo('<ul>');
foreach($version_notes as $note) {
echo('<li>'.$note.'</li>');
}
echo('</ul>');
}
echo('</p>');
}
?>
</div>
<div class="card-body">
......@@ -212,7 +224,7 @@ if($shutdown_nodl) {
if($row = $res->fetch_assoc()) {
switch($row['value']) {
case 1:
echo('<p>Update requested</p>');
echo('<p>Update queued</p>');
break;
case 2:
$upgrade_in_progress = 1;
......