ref: 5643539f4d10474043a4178bb43ad7c9890e0780
parent: 43a34442c946fa387bef7968a036a62436868bd8
author: sirjofri <sirjofri@sirjofri.de>
date: Thu Jul 2 04:11:00 EDT 2020
moves griddy to subdirectory 9gridchan, commits mkfile changes
--- a/mkfile
+++ b/mkfile
@@ -6,7 +6,7 @@
nl='
'
-build:QV: changeblog.ht $OBJECTS pub/index.html pub/changeblog.xml pub/changeblog/changeblog.pdf
+build:QV: changeblog.ht $OBJECTS pub/index.html pub/changeblog.xml pub/changeblog/changeblog.pdf pub/files/head.html pub/files/foot.html
echo 'Build complete'
prepare:QV: changeblog.ht
@@ -101,4 +101,8 @@
if(! test -d $dirpart)
mkdir -p $dirpart
cat $prereq | sed -e 's:PAGETITLE:'^$stem^':g' > pub/$stem/index.html
+ echo '√ '^$target
+
+pub/files/%.html:QV: %.htf
+ sed -e 's:PAGETITLE:files:g' $prereq > $target
echo '√ '^$target
--- a/pub/files/.htaccess
+++ b/pub/files/.htaccess
@@ -7,4 +7,4 @@
ReadmeName /files/foot.html
AddDescription "easy/simple replica(1) wizard" guidedreplica
-AddDescription "9gridchan gridstart alternative" griddy
+AddDescription "9gridchan scripts (9gridchan.org)" 9gridchan
--- /dev/null
+++ b/pub/files/9gridchan/.htaccess
@@ -1,0 +1,1 @@
+AddDescription "gridstart alternative: cleaner, smaller, quiet mode" griddy
--- /dev/null
+++ b/pub/files/9gridchan/griddy
@@ -1,0 +1,55 @@
+#!/bin/rc
+
+flagfmt='t:tls,p:pub,q:quiet'
+
+if(! ifs=() eval `{aux/getflags $*}){
+ aux/usage
+ echo ' -t prefer tls
+ -p mount pubregistry services
+ -q quiet. Don''t ask, just do.' >[1=2]
+ exit usage
+}
+
+# remove old services
+test -e /srv/gridregistry && {
+ if(~ $quiet 1) ans=n
+ if not{
+ echo 'old grid connections found in /srv, remove? (y/n)'
+ ans=`{read}
+ }
+ if(~ $ans y){
+ echo 'removing old'
+ rm /srv/gridchat
+ rm /srv/gridplumber
+ rm /srv/gridram
+ rm /srv/gridregistry
+ rm /srv/gridroot
+ rm /srv/gridwiki
+ rm /srv/griddisk
+ rm /srv/pubregistry
+ }
+}
+
+# mount grid services (from registry)
+~ $tls 1 && {
+ echo 'mount services (tls)'
+ test -r /mnt/factotum/ctl || auth/factotum -n
+ echo 'key proto=dp9ik user=glenda dom=grid !password=9gridchan' >/mnt/factotum/ctl
+ srvtls tcp!registry.9gridchan.org!16675 gridregistry /mnt/registry
+ awk '/tlssrv/{print "srvtls -c", $1, $3, $5}' /mnt/registry/index | rc
+}
+~ $tls 1 || {
+ echo 'mount services (no tls)'
+ srv tcp!registry.9gridchan.org!6675 gridregistry /mnt/registry
+ awk '/exportfs/{print "srv -c", $1, $3, $5}' /mnt/registry/index | rc
+}
+
+# mount public grid services (from pubregistry)
+~ $pub 1 && {
+ echo 'mount public services (pubregistry)'
+ test -r /n/pubregistry/index || { echo 'pubregistry not found' >[1=2] }
+ test -r /n/pubregistry/index && {
+ awk '/tlssrv/{print "srvtls -c", $1, $3, $5}' /n/pubregistry/index
+ awk '/exportfs/{print "srv -c", $1, $3, $5}' /n/pubregistry/index
+ } | rc
+}
--- a/pub/files/griddy
+++ /dev/null
@@ -1,55 +1,0 @@
-#!/bin/rc
-
-flagfmt='t:tls,p:pub,q:quiet'
-
-if(! ifs=() eval `{aux/getflags $*}){
- aux/usage
- echo ' -t prefer tls
- -p mount pubregistry services
- -q quiet. Don''t ask, just do.' >[1=2]
- exit usage
-}
-
-# remove old services
-test -e /srv/gridregistry && {
- if(~ $quiet 1) ans=n
- if not{
- echo 'old grid connections found in /srv, remove? (y/n)'
- ans=`{read}
- }
- if(~ $ans y){
- echo 'removing old'
- rm /srv/gridchat
- rm /srv/gridplumber
- rm /srv/gridram
- rm /srv/gridregistry
- rm /srv/gridroot
- rm /srv/gridwiki
- rm /srv/griddisk
- rm /srv/pubregistry
- }
-}
-
-# mount grid services (from registry)
-~ $tls 1 && {
- echo 'mount services (tls)'
- test -r /mnt/factotum/ctl || auth/factotum -n
- echo 'key proto=dp9ik user=glenda dom=grid !password=9gridchan' >/mnt/factotum/ctl
- srvtls tcp!registry.9gridchan.org!16675 gridregistry /mnt/registry
- awk '/tlssrv/{print "srvtls -c", $1, $3, $5}' /mnt/registry/index | rc
-}
-~ $tls 1 || {
- echo 'mount services (no tls)'
- srv tcp!registry.9gridchan.org!6675 gridregistry /mnt/registry
- awk '/exportfs/{print "srv -c", $1, $3, $5}' /mnt/registry/index | rc
-}
-
-# mount public grid services (from pubregistry)
-~ $pub 1 && {
- echo 'mount public services (pubregistry)'
- test -r /n/pubregistry/index || { echo 'pubregistry not found' >[1=2] }
- test -r /n/pubregistry/index && {
- awk '/tlssrv/{print "srvtls -c", $1, $3, $5}' /n/pubregistry/index
- awk '/exportfs/{print "srv -c", $1, $3, $5}' /n/pubregistry/index
- } | rc
-}