diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | README | 34 | ||||
| -rw-r--r-- | site/index.org | 10 | ||||
| -rw-r--r-- | site/minutes/2011-01-10-board.pdf | bin | 47599 -> 86601 bytes | |||
| -rw-r--r-- | site/minutes/2011-02-13-board-notes.pdf | bin | 0 -> 91766 bytes | |||
| -rw-r--r-- | site/organisation.org | 10 |
6 files changed, 66 insertions, 7 deletions
@@ -2,7 +2,7 @@ EMACS=emacs -q --no-site-file all: fripost-web -fripost-web: +fripost-web: # creates home page $(EMACS) -batch -L . \ -l "fripost-web.el" \ -eval "(org-publish-project \"fripost-web\")" @@ -10,3 +10,20 @@ fripost-web: find publish -iname "*.html" -exec perl -pi -e 's!\\ndash!–!' {} \; # Remove Emacs backup files find publish -name "*~" -delete + +send: # sends to fripost.org for publication + rsync -ruvp publish/ fripost@fripost.org:fripost.org/ + +clean: + rm *~*; rm test test.d/test; rmdir test.d + +# Debuging and testing +send-test: test.d/test + rsync -ruvp test.d/ fripost@fripost.org:fripost.org/ + +test.d/test: test.d + echo This is the test file for fripost-web. > test.d/test +test.d: + mkdir test.d + + @@ -1,3 +1,37 @@ This repository contains the website of Fripost. http://fripost.org/ + +Use make to compile the page and copy it to fripost.org + + # compilation + $ make + + # publication + $ make send + +This is the standard project workflow + + 1. Pull all repositories (ask Gustav and Stefan) + 2. Perform local changes + - One change, one commit + 3. Compile and check ocularly locally through web browser + 4. Send to fripost.org + - Perform an ocular check on fripost.org + 5. Push changes to your repository + +These are the repositories to check for changes + + - Fetch URL:s + - git://repo.or.cz/fripost-web.git + - http://repo.or.cz/r/fripost-web.git + - git://github.com/skangas/fripost-web.git + - Push URL:s + - ssh://repo.or.cz/srv/git/fripost-web.git + - git://github.com/skangas/fripost-web.git + +To get push access to the repository at repo, get an account, and send an email to Gustav (see contact below) + +(C) Copyright cc-by-sa 2010-2011 Gustav Eek <gustaveek@student.gu.se> and Stefan Kangas. + +You are free to use, change and redistribute this source according to the terms defined by Creative Commons Licence 3.0 Contribution Share Alike. diff --git a/site/index.org b/site/index.org index f557ec0..d511088 100644 --- a/site/index.org +++ b/site/index.org @@ -3,11 +3,13 @@ #+BEGIN_HTML <div class="square"> +<h1>Uppstartsfest</h1> +<p>Lördag 12 mars 2011 kl 14--22, Gnutiken. <it>Mer info kommer.</it> +</p> <h1>Nästa möte</h1> - -<p>Styrelsemöte torsdag 3 februari 2011 klockan 17:30 på <a -href="gnutiken.html">Gnutiken</a>. <a -href="https://wiki.fripost.org/moten/2011-02-03/">Läs mer.</a></p> </div> +<p>Styrelsemöte söndag 20 februari 2011 kl 16:00, <a href="gnutiken.html">Gnutiken</a>. +</p> +</div> #+END_HTML Teknologi är inte och har aldrig varit någonting neutralt. På Internet diff --git a/site/minutes/2011-01-10-board.pdf b/site/minutes/2011-01-10-board.pdf Binary files differindex e2ca978..0c95d37 100644 --- a/site/minutes/2011-01-10-board.pdf +++ b/site/minutes/2011-01-10-board.pdf diff --git a/site/minutes/2011-02-13-board-notes.pdf b/site/minutes/2011-02-13-board-notes.pdf Binary files differnew file mode 100644 index 0000000..d3c0382 --- /dev/null +++ b/site/minutes/2011-02-13-board-notes.pdf diff --git a/site/organisation.org b/site/organisation.org index 4f99e36..6afa400 100644 --- a/site/organisation.org +++ b/site/organisation.org @@ -66,6 +66,12 @@ samtliga system. * Mötesrapporter och protokoll +** 2011-02-13 Styrelsemöte + +Mötets syfte var att diskutera Friposts fest 12 mars. Formen var informell. + + - [[file:minutes/2011-02-13-board-notes.pdf][Anteckningar styrelsemöte 13 februari 2011]] + ** 2011-02-03 Styrelsemöte På grund av sjukdom blev det inget formellt möte. Istället gick vi igenom och @@ -77,7 +83,7 @@ diskuterade vissa detaljer i e-postsystemet. ** 2011-01-20 Styrelsemöte -- [[file:minutes/2011-01-20-board.pdf][Protokoll styrelsemöte 2011-01-20]] + - [[file:minutes/2011-01-20-board.pdf][Protokoll styrelsemöte 2011-01-20]] ** 2011-01-10 Styrelsemöte @@ -86,7 +92,7 @@ två stycken externa 2TB USB-hårddiskar till säkerhetskopior och att vi under nästa vecka försöker få igång den av Leif-Jöran utlånade RAID-arrayen. Denna ska fungera som huvudsaklig IMAP tills vidare. -- [[file:minutes/2011-01-10-board.pdf][Protokoll styrelsemöte 2011-01-10]] + - [[file:minutes/2011-01-10-board.pdf][Protokoll styrelsemöte 2011-01-10] ** 2010-12-09 Öppet möte om kryptering av e-post |