summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Frost <gregfrost1@bigpond.com>2009-08-30 09:10:48 (GMT)
committerGreg Frost <gregfrost1@bigpond.com>2009-08-30 09:10:48 (GMT)
commite1f823b6f7a09598799e7dfcee44862003074469 (patch)
treeee20ffd746561853829896c678678f024335ab33
parent878aa1ed4763f813ea0d306c408c5fb682158881 (diff)
parent57f9faeb2bc2a0d0022d9bbcc8077327f4365b1f (diff)
downloadlinhes_pkgbuild-e1f823b6f7a09598799e7dfcee44862003074469.zip
linhes_pkgbuild-e1f823b6f7a09598799e7dfcee44862003074469.tar.gz
linhes_pkgbuild-e1f823b6f7a09598799e7dfcee44862003074469.tar.bz2
Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD
-rw-r--r--abs/core-testing/local-website/PKGBUILD2
-rw-r--r--abs/core-testing/local-website/htdocs/index.html2
-rw-r--r--abs/extra-testing/community/foldingathome/PKGBUILD2
-rw-r--r--abs/extra-testing/community/foldingathome/foldingathome.install4
4 files changed, 6 insertions, 4 deletions
diff --git a/abs/core-testing/local-website/PKGBUILD b/abs/core-testing/local-website/PKGBUILD
index a0f666c..da53253 100644
--- a/abs/core-testing/local-website/PKGBUILD
+++ b/abs/core-testing/local-website/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=local-website
pkgver=2
-pkgrel=13
+pkgrel=14
pkgdesc="Contents of http://localhost"
arch=(i686 x86_64)
license=('GPL')
diff --git a/abs/core-testing/local-website/htdocs/index.html b/abs/core-testing/local-website/htdocs/index.html
index 1c5c05b..964ca9c 100644
--- a/abs/core-testing/local-website/htdocs/index.html
+++ b/abs/core-testing/local-website/htdocs/index.html
@@ -68,7 +68,7 @@
</p>
- <p><a href="folding@home/"><b>My Folding Status</b></a>: <br>
+ <p><a href="foldingathome/"><b>My Folding Status</b></a>: <br>
&nbsp; &nbsp; Status of the folding@home work for the local user.
</p>
diff --git a/abs/extra-testing/community/foldingathome/PKGBUILD b/abs/extra-testing/community/foldingathome/PKGBUILD
index e6b6788..bb93407 100644
--- a/abs/extra-testing/community/foldingathome/PKGBUILD
+++ b/abs/extra-testing/community/foldingathome/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=foldingathome
pkgver=6.02
-pkgrel=5
+pkgrel=6
pkgdesc="Folding@Home is a distributed computing project which studies protein folding, misfolding, aggregation, and related diseases."
arch=('i686')
url="http://folding.stanford.edu/"
diff --git a/abs/extra-testing/community/foldingathome/foldingathome.install b/abs/extra-testing/community/foldingathome/foldingathome.install
index 8bcfaf3..20e48d1 100644
--- a/abs/extra-testing/community/foldingathome/foldingathome.install
+++ b/abs/extra-testing/community/foldingathome/foldingathome.install
@@ -34,7 +34,9 @@ port=8080
EOM
fi
fi
-
+ rm -fr $r6_fah_dir/index.html
+ ln -s $r6_fah_dir/MyFolding.html $r6_fah_dir/index.html
+ ln -s $r6_fah_dir /data/srv/httpd/htdocs/foldingathome
/sbin/add_service.sh fah
}