diff options
| author | Peter Palfrader <peter@palfrader.org> | 2012-11-26 18:28:36 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2012-11-26 18:28:36 +0000 |
| commit | 5af690bd8b920e4815ba51285d4e72e1ccd19330 (patch) | |
| tree | 561db49fc10f9947230ab07388cb8a45f48c420e | |
| parent | 27ba00cb9222c674d545bfd98590386a2e063d70 (diff) | |
use date -R instead of 822-date
| -rwxr-xr-x | bin/allpingers-ini2xml | 2 | ||||
| -rw-r--r-- | other/mixminion/Makefile | 2 | ||||
| -rw-r--r-- | web/Makefile.am | 17 | ||||
| -rw-r--r-- | web/allpingers/emmanuel | 13 |
4 files changed, 31 insertions, 3 deletions
diff --git a/bin/allpingers-ini2xml b/bin/allpingers-ini2xml index 9add8ae..015a7d2 100755 --- a/bin/allpingers-ini2xml +++ b/bin/allpingers-ini2xml @@ -125,7 +125,7 @@ print qq{ ]> }; -my $now = `822-date`; +my $now = `date -R`; chomp $now; printf qq{<pingers version="1" generated="%s">\n}, $now; for my $pinger (sort keys %pingers) { diff --git a/other/mixminion/Makefile b/other/mixminion/Makefile index 78706a5..c93821e 100644 --- a/other/mixminion/Makefile +++ b/other/mixminion/Makefile @@ -18,4 +18,4 @@ all: bin/rrd-update $$NAME rm -rf result mkdir result - bin/rrd-graph + bin/rrd-graph 2>&1 | grep -v "*** attempt to put segment in horiz list twice" || true diff --git a/web/Makefile.am b/web/Makefile.am index 96e0530..58de96f 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -14,5 +14,20 @@ SUBDIRS = \ based_in = htdocs include $(top_srcdir)/Makefile.common -doc_DATA = index.php resources.html favicon.ico +doc_DATA = index.php resources.html favicon.ico echolot/copied.stamp #doc_DATA = account-create.php account-edit.php index.php login.php logout.php remsaint-subscription.php remsaint.php resources.html favicon.ico + +.PHONY: echolot/copied.stamp +echolot/copied.stamp: + rsync -rav --exclude copied.stamp --delete $(ECHOLOT_BASE)/results/ echolot + touch "$@" + +clean: + rm -rf echolot + +install-data-local: echolot/copied.stamp + [ -d $(docdir) ] || mkdir $(docdir) + rsync -rav --delete echolot/ $(docdir)/echolot + +uninstall-local: + rm -f $(docdir)/echolot diff --git a/web/allpingers/emmanuel b/web/allpingers/emmanuel new file mode 100644 index 0000000..fe96b0e --- /dev/null +++ b/web/allpingers/emmanuel @@ -0,0 +1,13 @@ +base = http://pinger.winstonsmith.info/ +rlist = http://pinger.winstonsmith.info/rlist.txt +mlist = http://pinger.winstonsmith.info/mlist.txt +rlist2 = http://pinger.winstonsmith.info/rlist2.txt +mlist2 = http://pinger.winstonsmith.info/mlist2.txt +rlist_html = http://pinger.winstonsmith.info/rlist.html +mlist_html = http://pinger.winstonsmith.info/mlist.html +rlist2_html = http://pinger.winstonsmith.info/rlist2.html +mlist2_html = http://pinger.winstonsmith.info/mlist2.html +pgpring = http://pinger.winstonsmith.info/pgp-all.asc +pgpring_rsa = http://pinger.winstonsmith.info/pgp-rsa.asc +mixring = http://pinger.winstonsmith.info/pubring.mix +type2list = http://pinger.winstonsmith.info/type2.list |