]> i-scream Git - www.i-scream.org.git/commitdiff
Various website updates.
authorTim Bishop <tim@bishnet.net>
Thu, 12 Jan 2012 16:14:40 +0000 (16:14 +0000)
committerTim Bishop <tim@bishnet.net>
Thu, 12 Jan 2012 16:14:40 +0000 (16:14 +0000)
Add links to new Git repositories.
Removed mention of Laroona. That never happened.
Add section on contributing.
Various minor tweaks.

www/contributing.xhtml [new file with mode: 0644]
www/cvs.xhtml
www/git.xhtml [new file with mode: 0644]
www/index.xhtml
www/laroona/index.xhtml [deleted file]
www/mailinglists.xhtml
www/menu-static.inc
www/menu.inc
www/who.xhtml

diff --git a/www/contributing.xhtml b/www/contributing.xhtml
new file mode 100644 (file)
index 0000000..672bd11
--- /dev/null
@@ -0,0 +1,51 @@
+<!--#include virtual="/doctype.inc" -->
+  <head>
+    <title>
+      Contributing to i-scream projects
+    </title>
+<!--#include virtual="/style.inc" -->
+  </head>
+  <body>
+    <div id="container">
+      <div id="main">
+<!--#include virtual="/header.inc" -->
+        <div id="contents">
+          <h1 class="top">
+            Contributing to i-scream projects
+          </h1>
+          <p>
+            We welcome contributions to our code so that everyone
+            can benefit from your changes. To make life easier we
+            have a few simple suggestions on how to go about doing
+            it. Please submit changes using one of the two methods
+            below.
+          </p>
+          <h3>
+            GitHub Pull Request
+          </h3>
+          <p>
+            If you've got changes for one of our active projects then
+            it'll almost certainly be available on our
+            <a href="http://github.com/i-scream">GitHub</a> page. If
+            you're familiar with Git the best way to send changes is
+            to fork our project on GitHub, commit your changes to your
+            copy, and then initiate a pull request.
+          </p>
+          <p>
+            If you're a Git user but don't want to use GitHub, just
+            use Git to generate a patch and we'll merge it by hand.
+          </p>
+          <h3>
+            Unified Diff
+          </h3>
+          <p>
+            If you don't use Git at all you can send us your patches
+            as a plain text unified diff. We'll merge it by hand.
+          </p>
+        </div>
+<!--#include virtual="/footer.inc" -->
+      </div>
+<!--#include virtual="/menu.inc" -->
+    </div>
+  </body>
+</html>
index 1797d68c0c6ed7a74734230f64ee3c8b28421f1c..64fd6d4924547dfac9981821bea7d070a8df4077 100644 (file)
@@ -1,7 +1,7 @@
 <!--#include virtual="/doctype.inc" -->
   <head>
     <title>
-      i-scream cvs repository
+      i-scream CVS Repository
     </title>
 <!--#include virtual="/style.inc" -->
   </head>
             i-scream CVS Repository
           </h1>
           <p>
-            The i-scream CVS Repository contains all code,
+            The i-scream CVS Repository contains code,
             documentation, and other files pertaining to all i-scream
             projects.
           </p>
+          <p>
+            <b>All new code with be found in our
+            <a href="/git.xhtml">Git</a> repositories.</b>
+          </p>
           <p>
             All code available in the CVS Repository is
-            <a href= "/license.xhtml">licensed</a> under the GPL.
+            <a href="/license.xhtml">licensed</a> under the GPL.
           </p>
           <h3>
             Web Access
@@ -51,7 +55,7 @@
           </h3>
           <p>
             Anyone can access the i-scream CVS repository in anonymous
-            mode read-only mode. The following commands will allow you
+            read-only mode. The following commands will allow you
             to check out a portion of the CVS repository. To see what
             is available it is recommended that you first look at the
             web frontend.
diff --git a/www/git.xhtml b/www/git.xhtml
new file mode 100644 (file)
index 0000000..c4fb7e4
--- /dev/null
@@ -0,0 +1,83 @@
+<!--#include virtual="/doctype.inc" -->
+  <head>
+    <title>
+      i-scream Git Repositories
+    </title>
+<!--#include virtual="/style.inc" -->
+  </head>
+  <body>
+    <div id="container">
+      <div id="main">
+<!--#include virtual="/header.inc" -->
+        <div id="contents">
+          <h1 class="top">
+            i-scream Git Repositories
+          </h1>
+          <p>
+            The i-scream Git repositories contain the currently
+            developed source code. All historic source code can be
+            found in <a href="/cvs.xhtml">CVS</a>.
+          </p>
+          <p>
+            All code available in the Git repositories is
+            <a href= "/license.xhtml">licensed</a> under the GPL.
+          </p>
+          <h3>
+            Web Access
+          </h3>
+          <p>
+            We use GitWeb to provide a visual frontend to the Git
+            repositories. It allows you to browse around each repository,
+            viewing any version of a file, and the differences between
+            different versions. There is also a link to download the
+            latest version of any section.
+          </p>
+          <p>
+            <a href="http://git.i-scream.org/">http://git.i-scream.org/</a>
+          </p>
+          <h3>
+            Anonymous Git Access (read-only)
+          </h3>
+          <p>
+            Anyone can access the i-scream Git repositories in anonymous
+            read-only mode. The following commands will both allow you
+            to check out the libstatgrab repository. To see what other
+            repositories are available you can look at the web frontend.
+            Choose whichever protocol you prefer.
+          </p>
+          <pre>
+git clone http://git.i-scream.org/libstatgrab
+git clone git://git.i-scream.org/libstatgrab
+</pre>
+          <h3>
+            Developer CVS Access (write)
+          </h3>
+          <p>
+            The i-scream development team have write access to the
+            required Git repositories. This is only available over SSH on
+            a non-standard port. You will need to have a SSH key
+            installed on the server first. Then just clone and push
+            using ssh.
+          </p>
+          <pre>
+git clone ssh://git@git.i-scream.org/libstatgrab
+</pre>
+          <h3>
+            GitHub Mirror
+          </h3>
+          <p>
+            Our Git repositories are mirrored on GitHub. The master
+            repository that we'll push commits to is located here, but
+            we provide the GitHub mirrors to make it easier for you to
+            make changes and work with our code.
+          </p>
+          <p>
+            <a href="http://github.com/i-scream">http://github.com/i-scream</a>
+          </p>
+        </div>
+<!--#include virtual="/footer.inc" -->
+      </div>
+<!--#include virtual="/menu.inc" -->
+    </div>
+  </body>
+</html>
index fc10f740dff2b0466876f211365ddb392b908aab..5a2e21f671fcdbf0ee9023f0dd90b919f63e753c 100644 (file)
           <h2>
             <a id="news">News</a>
           </h2>
+          <h3>
+            Thursday 12 January 2012
+          </h3>
+          <h4>
+            Source code moved to Git
+          </h4>
+          <p>
+            We've moved both libstatgrab and pystatgrab to their
+            own Git repositories. CVS will remain for everything
+            else for now.
+          </p>
           <h3>
             Sunday 21 February 2010
           </h3>
             those of libstatgrab, and returns data in structures that
             logically map on to those of libstatgrab.
           </p>
-          <h3>
-            Laroona
-          </h3>
-          <ul>
-            <li>
-              <a href="/laroona/">Laroona homepage</a>
-            </li>
-          </ul>
-          <p>
-            Laroona is the new central monitoring system. It's still
-            very much in the early stages of development, and doesn't
-            have any code available for download yet. Look at the
-            project page for more on the development process.
-          </p>
           <h3>
             CMS - Central Monitoring System
           </h3>
             have other related projects, as well as the CMS.
           </p>
           <p>
-            The CMS is no longer being developed. We are now putting
-            our time into a new project redeveloping the CMS. We're
-            taking the good ideas from the old CMS, improving some of
-            the weaknesses, and we'll hopefully produce are far
-            superior product.
+            The CMS is no longer being developed.
           </p>
           <h2>
             <a id="about">About</a>
diff --git a/www/laroona/index.xhtml b/www/laroona/index.xhtml
deleted file mode 100644 (file)
index c8a97dc..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--#include virtual="/doctype.inc" -->
-  <head>
-    <title>
-      i-scream Laroona homepage
-    </title>
-<!--#include virtual="/style.inc" -->
-  </head>
-  <body>
-    <div id="container">
-      <div id="main">
-<!--#include virtual="/header.inc" -->
-        <div id="contents">
-          <h1 class="top">
-            i-scream Laroona homepage
-          </h1>
-          <div id="topnav">
-            <ul>
-              <li>
-                <a href="#news">News</a>
-              </li>
-              <li>
-                <a href="#what">What is Laroona?</a>
-              </li>
-              <li>
-                <a href="#development">Development</a>
-              </li>
-            </ul>
-          </div>
-<!--#include virtual="/bannerad.inc" -->
-          <h2>
-            <a id="news">News</a>
-          </h2>
-          <h3>
-            Sunday 21 March 2004
-          </h3>
-          <p>
-            Laroona project page created.
-          </p>
-          <h2>
-            <a id="what">What is Laroona?</a>
-          </h2>
-          <p>
-            Laroona is a rewrite of the <a href="/cms/">CMS</a>.
-          </p>
-          <h2>
-            <a id="development">Development</a>
-          </h2>
-          <ul>
-            <li>
-              <a href="http://wiki.i-scream.org/">i-scream wiki</a>
-            </li>
-          </ul>
-          <p>
-            Laroona is currently in the early stages of development.
-            Much of our development work is being done on the i-scream
-            Wiki.
-          </p>
-        </div>
-<!--#include virtual="/footer.inc" -->
-      </div>
-<!--#include virtual="/menu.inc" -->
-    </div>
-  </body>
-</html>
index bfc6dd0691ff3ceeb9150dfd318a3d7560b531ba..b717cbd0e888361995ab410ae1c5395b7ec41635 100644 (file)
             <a href="http://lists.i-scream.org/mailman/listinfo/commits">http://lists.i-scream.org/mailman/listinfo/commits</a><br />
             <b>State:</b> Open for subscription, but no posts should be
             sent here.<br />
-            <b>Purpose:</b> Daily commit logs from the i-scream CVS
-            repository are sent to this list. If you wish to keep up on
-            development, join this list.
+            <b>Purpose:</b> Emails are sent to this list whenever a
+            commit happens to the i-scream Git or CVS repositories. If
+            you want to be informed about commits as they happen, join
+            this list.
           </p>
           <h3>
             cvs-all@i-scream.org
           <p>
             <b>Information:</b>
             <a href="http://lists.i-scream.org/mailman/listinfo/cvs-all">http://lists.i-scream.org/mailman/listinfo/cvs-all</a><br />
-            <b>State:</b> Open for subscription, but no posts should be
-            sent here.<br />
-            <b>Purpose:</b> Emails are sent to this list whenever a
-            commit happens to the i-scream cvs repository. If you want
-            to be informed about commits as they happen, join this
-            list.
+            <b>State:</b> Retired.<br />
+            <b>Purpose:</b> This list contained CVS commit emails, but
+            this has now been merged with the commits list above.
           </p>
           <h3>
             users@i-scream.org
           </h3>
           <p>
             All lists are scanned using
-            <a href="http://www.mailscanner.info">MailScanner</a> to
+            <a href="http://www.clamav.net">ClamAV</a> and
+            <a href="http://spamassassing.apache.org">SpamAssassin</a> to
             remove viruses before they get sent out to list members.
-            We also use MailScanner to tag spam messages accordingly,
-            and ensure that such messages are moderated.
+            We also tag spam messages accordingly, and ensure that such
+            messages are moderated.
           </p>
         </div>
 <!--#include virtual="/footer.inc" -->
index dcbcd5d43ab2367a0e5a938b904daa02b66731f3..6b8a939fe05e884075e70a1587aeb40803c0d1db 100644 (file)
@@ -15,7 +15,6 @@
         <ul>
           <li><a href="http://www.i-scream.org/libstatgrab/">libstatgrab</a></li>
           <li><a href="http://www.i-scream.org/pystatgrab/">pystatgrab</a></li>
-          <li><a href="http://www.i-scream.org/laroona/">Laroona</a></li>
           <li><a href="http://www.i-scream.org/cms/">CMS</a></li>
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mirrors.xhtml">Download Mirrors</a></li>
         </ul>
         <ul>
+          <li><a href="http://www.i-scream.org/git.xhtml">Git Repositories</a></li>
           <li><a href="http://www.i-scream.org/cvs.xhtml">CVS Repository</a></li>
         </ul>
+        <ul>
+          <li><a href="http://www.i-scream.org/contributing.xhtml">Contributing</a></li>
+        </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
           <li><a href="http://www.i-scream.org/support.xhtml">Support</a></li>
index 76fdc089d9f880d47249ca4f7d399f28ac532a7a..4692d84337601e97f258b06a51b42a9ed5a67339 100644 (file)
@@ -15,7 +15,6 @@
         <ul>
           <li><a href="http://www.i-scream.org/libstatgrab/">libstatgrab</a></li>
           <li><a href="http://www.i-scream.org/pystatgrab/">pystatgrab</a></li>
-          <li><a href="http://www.i-scream.org/laroona/">Laroona</a></li>
           <li><a href="http://www.i-scream.org/cms/">CMS</a></li>
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mirrors.xhtml">Download Mirrors</a></li>
         </ul>
         <ul>
+          <li><a href="http://www.i-scream.org/git.xhtml">Git Repositories</a></li>
           <li><a href="http://www.i-scream.org/cvs.xhtml">CVS Repository</a></li>
         </ul>
+        <ul>
+          <li><a href="http://www.i-scream.org/contributing.xhtml">Contributing</a></li>
+        </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
           <li><a href="http://www.i-scream.org/support.xhtml">Support</a></li>
index b4e2e8c631727c10cffba88b2e2d8e40a8ac1f0c..4f68cae9d33b73876ade81bbd0ca2338629f5e71 100644 (file)
@@ -25,9 +25,7 @@
             Since the end of that year we've had a few changes in
             members, but we're still developing software. We've taken
             the <a href="/cms/">CMS</a> and developed it further, and
-            we've written libraries to support it. We're now working on
-            a new system to replace it known currently as
-            <a href="/laroona/">Laroona</a>.
+            we've written libraries to support it.
           </p>
           <h2>
             Current team
@@ -50,7 +48,7 @@
             <b>Alex Moore</b>
           </p>
           <p>
-            <b>Adam Sampson</b> - ats@i-scream.org
+            <b>Adam Sampson</b> - ats@offog.org
           </p>
           <ul>
             <li>