fix myHOST
This commit is contained in:
Yann Autissier
parent
b57cc06286
commit
05f1a9b4c0
|
|
@ -6,46 +6,50 @@ myHash() {
|
|||
|| myHash=$(template_register |ipfs add -q)
|
||||
[ ! -f ~/.zen/game/players/localhost/latest ] \
|
||||
&& echo "$myHash" > ~/.zen/game/players/localhost/latest
|
||||
[ -n "$myHash" ] \
|
||||
&& echo "$myHash"
|
||||
[ -n "$myHash" ] && echo "$myHash"
|
||||
}
|
||||
|
||||
myHttp() {
|
||||
echo "$(myHttpHeader)"
|
||||
echo
|
||||
echo "$(myHttpContent)"
|
||||
[ -n "$(myHttpHeader)" ] \
|
||||
&& echo "${myHttpHeader}" \
|
||||
&& echo
|
||||
[ -n "$(myHttpContent)" ] \
|
||||
&& echo "${myHttpContent}"
|
||||
}
|
||||
|
||||
myHttpContent() {
|
||||
[ -n "$(myHash)" ] \
|
||||
&& myHttpContent="<html><head><title>302 Found</title></head><body><h1>Found</h1>
|
||||
<p>The document is <a href=\""ipfs/$(myHash)"\">here</a> in IPFS.</p></body></html>" \
|
||||
&& echo "$myHttpContent"
|
||||
}
|
||||
|
||||
myHttpHeader() {
|
||||
[ -n "$(myHash)" ] \
|
||||
&& myHttpHeader="HTTP/1.0 302 Found
|
||||
Content-Type: text/html; charset=UTF-8
|
||||
Content-Length: $(myHttpContent |wc -c)
|
||||
Date: $(date -R)
|
||||
Location: ipfs/$(myHash)
|
||||
Server: and"
|
||||
[ -n "$(myKey)" ] && myHttpHeader+="
|
||||
set-cookie: AND=$(myKey); expires=$(date -R -d "+1 month"); path=/; domain=.$myDomainName; Secure; SameSite=lax"
|
||||
[ -n "$myHttpHeader" ] && echo "$myHttpHeader"
|
||||
}
|
||||
|
||||
myIpfs() {
|
||||
myIpfs=${myIPFS}/ipfs/$(myHash)
|
||||
echo "$myIpfs"
|
||||
[ -n "$(myHash)" ] \
|
||||
&& myIpfs="${myIPFS}/ipfs/$(myHash)" \
|
||||
&& echo "$myIpfs"
|
||||
}
|
||||
|
||||
myIpns() {
|
||||
myIpns=${myIPFS}/ipns/$(myKey)
|
||||
echo "$myIpns"
|
||||
[ -n "$(myKey)" ] \
|
||||
&& myIpns="${myIPFS}/ipns/${myKey}" \
|
||||
&& echo "$myIpns"
|
||||
}
|
||||
|
||||
myKey() {
|
||||
myKey=$(ipfs key list -l | awk '$2 == "self" {print $1}')
|
||||
[ -n "$myKey" ] && echo "$myKey"
|
||||
}
|
||||
|
||||
myHttpContent() {
|
||||
myHash=$(myHash)
|
||||
myHttpContent="<html><head><title>302 Found</title></head><body><h1>Found</h1>
|
||||
<p>The document has moved <a href="ipfs/$myHash">here</a>.</p></body></html>"
|
||||
echo "$myHttpContent"
|
||||
}
|
||||
|
||||
myHttpHeader() {
|
||||
myHttpContent=$(myHttpContent)
|
||||
myHttpHeader="HTTP/1.0 302 Found
|
||||
Content-Type: text/html; charset=UTF-8
|
||||
Content-Length: $(myHttpContent |wc -c)
|
||||
Date: $(date -R)
|
||||
Location: ipfs/$myHash
|
||||
set-cookie: AND=$myKey; expires=$(date -R -d "+1 month"); path=/; domain=.$myDomainName; Secure; SameSite=lax
|
||||
Server: and"
|
||||
echo "$myHttpHeader"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,48 @@
|
|||
#shellcheck shell=sh
|
||||
|
||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
IPFSNODEID=$(jq -r .Identity.PeerID ~/.ipfs/config)
|
||||
myIP=$(hostname -I | awk '{print $1}' | head -n 1)
|
||||
isLAN=$(route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
|
||||
ipfsNodeId() {
|
||||
ipfsNodeId=$(jq -r .Identity.PeerID ~/.ipfs/config)
|
||||
[ -n "$ipfsNodeId" ] && echo "$ipfsNodeId"
|
||||
}
|
||||
|
||||
myDomainName=$(hostname -d 2>/dev/null) && [ -z "$myDomainName" ] && myDomainName=$(domainname 2>/dev/null) && [ "$myDomainName" = "(none)" ] && myDomainName="localhost"
|
||||
myHostName=$(hostname |sed 's/\.'${myDomainName}'$//')
|
||||
[ -n "$myDomainName" ] && myHostName="${myHostName}.${myDomainName}" || myDomainName=${myHostName#*.}
|
||||
[ -z "$myDomainName" ] && myDomainName=localhost
|
||||
myHOST="astroport.${myDomainName}"
|
||||
myIPFS="http://ipfs.${myDomainName}:8080"
|
||||
myASTROPORT="http://astroport.${myDomainName}:1234"
|
||||
isLan() {
|
||||
isLan=$(ip route |awk '$1 == "default" {print $3}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/" \
|
||||
|| route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
|
||||
[ -n "$isLan" && echo "$isLan"
|
||||
} 2>/dev/null
|
||||
|
||||
[ -z "$isLAN" ] && myIPFS="https://ipfs.${myDomainName}" && myASTROPORT="https://astroport.${myDomainName}" ||: ## WAN STATION
|
||||
myDomainName() {
|
||||
myDomainName=$(hostname -d 2>/dev/null) && [ -z "$myDomainName" ] && myDomainName=$(domainname 2>/dev/null) && [ "$myDomainName" = "(none)" ] && myDomainName="localhost"
|
||||
[ -n "$myDomainName" ] && echo "$myDomainNane"
|
||||
}
|
||||
|
||||
myHostName() {
|
||||
myHostName=$(hostname |sed 's/\.'$(myDomainName)'$//')
|
||||
[ -n "$myDomainName" ] && myHostName="${myHostName}.${myDomainName}" || myDomainName=${myHostName#*.}
|
||||
[ -z "$myDomainName" ] && myDomainName=localhost
|
||||
[ -n "$myHostName" ] && echo "$myHostName"
|
||||
}
|
||||
|
||||
myIp() {
|
||||
myIp=$(hostname -I | awk '{print $1}' | head -n 1)
|
||||
[ -n "$myIp" ] && echo "$myIp"
|
||||
}
|
||||
|
||||
myTs() {
|
||||
myTs=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
[ -n "$myTs" ] && echo "$myTs"
|
||||
}
|
||||
|
||||
[ -n "$(myTs)" ] && MOATS="${myTs}"
|
||||
[ -n "$(ipfsNodeId)" ] && IPFSNODEID="${ipfsNodeId}"
|
||||
[ -n "$(myIp)" ] && myIP="${myIp}"
|
||||
[ -n "$(isLan)" ] && isLAN="${isLan}"
|
||||
[ -n "$(myDomainName)" ] \
|
||||
&& myHOST="astroport.${myDomainName}" \
|
||||
&& myIPFS="http://ipfs.${myDomainName}:8080" \
|
||||
&& myASTROPORT="http://astroport.${myDomainName}:1234"
|
||||
## WAN STATION
|
||||
[ -n "$(myHostName)" ] && [ -z "$isLAN" ] \
|
||||
&& myHOST="astroport.${myHostName}" \
|
||||
&& myIPFS="https://ipfs.${myDomainName}" \
|
||||
&& myASTROPORT="https://astroport.${myDomainName}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue