Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
eol mode
  • Loading branch information
Luc Saffre committed May 29, 2011
1 parent 76eca20 commit bd43308
Show file tree
Hide file tree
Showing 9 changed files with 140 additions and 49 deletions.
1 change: 1 addition & 0 deletions SciTEDirectory.properties
@@ -1,2 +1,3 @@
# Unicode
code.page=65001
eol.mode = 'LF'
18 changes: 9 additions & 9 deletions bash/dump
@@ -1,9 +1,9 @@
#!/bin/bash
DPYFILE=`date +fixtures/d%Y%m%d$1.dpy`
echo $DPYFILE
if [ -f $DPYFILE ]
then
echo "Sorry, there is already a file $DPYFILE. Delete it yourself if you dare."
exit -1
fi
python manage.py dumpdata --format dpy > $DPYFILE
#!/bin/bash
DPYFILE=`date +fixtures/d%Y%m%d$1.dpy`
echo $DPYFILE
if [ -f $DPYFILE ]
then
echo "Sorry, there is already a file $DPYFILE. Delete it yourself if you dare."
exit -1
fi
python manage.py dumpdata --format dpy > $DPYFILE
4 changes: 2 additions & 2 deletions bash/pull
@@ -1,2 +1,2 @@
#!/bin/bash
cd /var/snapshots/lino && hg tip >> /var/log/lino/pull.log && hg pull -u
#!/bin/bash
cd /var/snapshots/lino && hg tip >> /var/log/lino/pull.log && hg pull -u
6 changes: 3 additions & 3 deletions bash/start
@@ -1,3 +1,3 @@
#!/bin/bash
sudo /etc/init.d/watch_tim start
[ "$?" == 0 ] && sudo /etc/init.d/apache2 start
#!/bin/bash
sudo /etc/init.d/watch_tim start
[ "$?" == 0 ] && sudo /etc/init.d/apache2 start
6 changes: 3 additions & 3 deletions bash/stop
@@ -1,3 +1,3 @@
#!/bin/bash
sudo /etc/init.d/watch_tim stop
[ "$?" == 0 ] && sudo /etc/init.d/apache2 stop
#!/bin/bash
sudo /etc/init.d/watch_tim stop
[ "$?" == 0 ] && sudo /etc/init.d/apache2 stop
71 changes: 39 additions & 32 deletions docs/admin/install.rst
Expand Up @@ -191,8 +191,9 @@ Explanations:
===================================== =========================================

Afterwards you'll have to manually adapt them:
- start and stop : remove the line for :term:`watch_tim` if you don't need this.
- oood : check the path of OpenOffice / LibreOffice

- `start` and `stop` : remove the line for :term:`watch_tim` if you don't need this.
- `oood` : check the path of OpenOffice / LibreOffice


Apply a patch for Django
Expand Down Expand Up @@ -269,42 +270,47 @@ Django docs on Apache and mod_wsgi:

You'll also need to configure Apache to do HTTP authentication: :doc:`ApacheHttpAuth`.

Set up your `/media/` directory
Set up your `/media` directory
-------------------------------

Lino uses the following types of static files:

=========================== =========================================== ============================================
Prefix Description location
=========================== =========================================== ============================================
/media/extjs/ ExtJS library /var/snapshots/ext-3.2.1/
/media/tinymce/ TinyMCE library /usr/share/tinymce/www
/media/lino/ lino.js and lino.css /var/snapshots/lino/lino/ui/extjs/media/
/media/cache/ files generated and served by
lino.modlib.documents /var/snapshots/lino/lino/demos/dsbe/media/
/media/beid/ image files for dsbe.models.PersonDetail ...
/media/upload/ Uploaded files
/media/webdav/ User-editable files
/media/webdav/doctemplates local doctemplates directory
=========================== =========================================== ============================================

The development server does these mappings automatically in `urls.py`.
The `/media` directory is the central place where Lino
expects static files to be served.

On a production server you'll probably add an ``Alias /media/ /usr/local/django/myproject/media/``
directive in your Apache config, and then use symbolic links in :file:`/usr/local/django/myproject/media/`::
Here is the structure it should have in a typical installation on Debian Squeeze::

mkdir /usr/local/django/myproject/media
cd /usr/local/django/myproject/media
mkdir cache
mkdir cache/js
mkdir upload
mkdir webdav
mkdir webdav/doctemplates
cd /usr/local/django/myproject
mkdir media
mkdir media/cache
mkdir media/cache/js
mkdir media/upload
mkdir media/webdav
mkdir media/webdav/doctemplates
ln -s /var/snapshots/lino/media lino
ln -s /var/snapshots/ext-3.3.1 extjs
ln -s /usr/share/tinymce/www tinymce


Lino uses the following types of static files:

=========================== ===========================================
Prefix Description
=========================== ===========================================
/media/extjs/ ExtJS library
/media/tinymce/ TinyMCE library
/media/lino/ lino.css
/media/cache/ temporary files created by Lino
/media/beid/ image files for dsbe.models.PersonDetail
/media/uploads/ Uploaded files
/media/webdav/ User-editable files
/media/webdav/doctemplates doctemplates directory
=========================== ===========================================

The development server does these mappings automatically in `urls.py`.
On a production server you'll probably add an
``Alias /media/ /usr/local/django/myproject/media/``
directive in your Apache config.


User permissions
----------------

Expand All @@ -313,14 +319,16 @@ You'll probably need to do something like this afterwards::
# chgrp -R www-data /var/snapshots /var/log/lino /usr/local/django
# chmod -R g+s /var/snapshots /var/log/lino /usr/local/django

``chmod g+s`` sets the SGID to ensure that when a new file is created in the directory it will inherit the group of the directory.
``chmod g+s`` sets the SGID to ensure that when a new file is created in the directory
it will inherit the group of the directory.

Maybe also::

$ chmod a+x /usr/local/django/myproject/manage.py

Maybe you'll also add `umask 002` to your `/etc/apache2/envvars`.
For example if `lino.log` doesn't exist and Lino creates it, you may want it to be writable by group.
For example if `lino.log` doesn't exist and Lino creates it,
you may want it to be writable by group.

And then add in your `/etc/mercurial/hgrc`::

Expand All @@ -337,7 +345,6 @@ It may be useful to tidy up::




OpenOffice.org server
=====================

Expand Down
50 changes: 50 additions & 0 deletions docs/tickets/43.rst
@@ -0,0 +1,50 @@
#43 : Neue Anwendung für Lucs Eigenbedarf?
==========================================

Also das Bloggen mit Sphinx macht mir ja Spaß,
und wenn ich mir noch Zeit nähme für gewisse Erweiterungen
wie automatisches Erstellen des Kalenders oder externe Fotos
oder automtisch generierte *release notes*,
dann bleibt mir doch nichts mehr zu wünschen übrig. Oder?

Gute Frage: könnte eine Lino-Anwendung
für meine eigenen Bedürfnisse auch das Bloggen noch
ermöglichen? Sphinx benutze ich ja eigentlich nur,
weil der DOS-Texteditor von TIM zum Bloggen nicht
wirklich zumutbar ist.

Hauptziel wäre eine einzige Blog-Datenbank für
alle Arbeitsbereiche und Projekte,
die zu diversen Websites veröffentlicht.

Die Tabellen wären ähnlich wie momentan in meinem internen TIM:

- Projekte, Tickets, Dienstleistungen
- Notizen
- Releases
- Verträge

Mit einem Unterschied: Dienstleistungsberichte nicht mehr in der DLS
selber, sondern als eine Notiz erfasst, die mit einer oder mehreren DL verknüpft
wäre. Andererseits können natürlich während einer DL mehrere Notizen erstellt werden.
Notion der "aktiven DL" (also die DL, in der das Taxometer momentan läuft),
wobei man also unterbrechen können muss und mehrere DL zugleich "offen"
haben kann.
Genauer gesagt bedeutet das, dass ein Ticket obligatorisch
wird und die DLS (Taxometer-Einträge) wirklich nur noch Datum und
Uhrzeit enthalten.

Macht es eigentlich Sinn, einen Arbeitstag mit allen
Unterbrechnungen festzuhalten? Antwort: für mich persönlich ist das ein
tragbarer Aufwand, und die Information hat mir schon oft nützliche Dienste
erwiesen. Im Gegenteil: das System müsste eigentlich noch optimiert werden,
damit genauere Erfassung möglich ist.
Zum Beispiel Telefonanrufe und E-Mails registrieren und
einem Ticket zuweisen können...

Aber die eigentliche Frage ist:
gibt es etwas Besseres zum Dokumentieren meiner Arbeit
als das momentane Spielen mit rst-Markup?
In Lino könnte ich Notizen mit vielen Verknüpfungsmöglichkeiten
zu anderen Objekten der Datenbank erfassen.
Die Antwort darauf werde ich nur kriegen, wenn ich das ausprobiere.
6 changes: 6 additions & 0 deletions docs/todo.rst
Expand Up @@ -589,6 +589,12 @@ Long-term
http://django-rest-framework.org/
instead of reinventing the wheel.
(Discovered :doc:`/blog/2011/0311`)

#. Demo fixtures should detect whether the database backend supports
utf8 encoding or not. If it doesn't, they could skip data
like Татьяна Казеннова that would cause trouble.
See :doc:`/blog/2011/0527`.
Alternative: make such data optional in a separate fixture.


Documentation
Expand Down
27 changes: 27 additions & 0 deletions docs/warnings.txt
@@ -0,0 +1,27 @@
T:\hgwork\lino\docs\todo.rst:582: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
T:\hgwork\lino\docs\todo.rst:585: (WARNING/2) Enumerated list ends without a blank line; unexpected unindent.
T:\hgwork\lino\docs\todo.rst:117: WARNING: py:class reference target not found: lino.apps.dsbe.settings.Lino
T:\hgwork\lino\docs\todo.rst:117: WARNING: xfile reference target not found: lino.js
T:\hgwork\lino\docs\todo.rst:167: WARNING: xfile reference target not found: lino.js
T:\hgwork\lino\docs\todo.rst:273: WARNING: xfile reference target not found: welcome.html
T:\hgwork\lino\docs\todo.rst:325: WARNING: py:mod reference target not found: lino.demos.igen
T:\hgwork\lino\docs\todo.rst:333: WARNING: py:mod reference target not found: lino.modlib.dsbe
T:\hgwork\lino\docs\todo.rst:391: WARNING: py:mod reference target not found: lino.modlib.system.models.SiteConfig
T:\hgwork\lino\docs\todo.rst:391: WARNING: py:mod reference target not found: django.contrib.sites
T:\hgwork\lino\docs\todo.rst:393: WARNING: xfile reference target not found: make_staff.py
T:\hgwork\lino\docs\todo.rst:403: WARNING: py:attr reference target not found: dsbe.models.Person.work_permit
T:\hgwork\lino\docs\todo.rst:464: WARNING: py:class reference target not found: lino.utils.printable.LatexBuildMethod
T:\hgwork\lino\docs\todo.rst:467: WARNING: py:attr reference target not found: links.Link.parent
T:\hgwork\lino\docs\todo.rst:470: WARNING: py:class reference target not found: auth.User
T:\hgwork\lino\docs\todo.rst:481: WARNING: py:attr reference target not found: links.Link.sequence
T:\hgwork\lino\docs\todo.rst:481: WARNING: py:class reference target not found: links.LinksByOwner
T:\hgwork\lino\docs\todo.rst:483: WARNING: py:meth reference target not found: contacts.Contact.address
T:\hgwork\lino\docs\todo.rst:483: WARNING: py:class reference target not found: contacts.Persons
T:\hgwork\lino\docs\todo.rst:493: WARNING: py:class reference target not found: links.LinksByOwner
T:\hgwork\lino\docs\todo.rst:495: WARNING: py:class reference target not found: notes.Note
T:\hgwork\lino\docs\todo.rst:495: WARNING: py:class reference target not found: notes.NoteType
T:\hgwork\lino\docs\todo.rst:511: WARNING: py:mod reference target not found: lino.modlib.ledger
T:\hgwork\lino\docs\todo.rst:511: WARNING: py:mod reference target not found: lino.modlib.finan
T:\hgwork\lino\docs\todo.rst:537: WARNING: py:meth reference target not found: Action.run
T:\hgwork\lino\docs\todo.rst:553: WARNING: py:mod reference target not found: <make_staff> lino.management.commands.make_staff
T:\hgwork\lino\docs\todo.rst:573: WARNING: py:meth reference target not found: lino.ui.extjs.ext_store.BooleanStoreField.parse_form_value

0 comments on commit bd43308

Please sign in to comment.