diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | alias_server/README (renamed from server/README) | 0 | ||||
| -rw-r--r-- | alias_server/__init__.py (renamed from server/__init__.py) | 2 | ||||
| -rw-r--r-- | alias_server/alias_plugin.py (renamed from server/alias_plugin.py) | 0 | ||||
| -rw-r--r-- | alias_server/component.py (renamed from server/component.py) | 0 | ||||
| -rw-r--r-- | alias_server/config.py (renamed from server/config.py) | 0 | ||||
| -rw-r--r-- | alias_server/object.py (renamed from server/object.py) | 0 | ||||
| -rw-r--r-- | alias_server/permission.py (renamed from server/permission.py) | 0 | ||||
| -rw-r--r-- | alias_server/scripts/server (renamed from server/server.py) | 4 | ||||
| -rw-r--r-- | alias_server/user.py (renamed from server/user.py) | 0 | ||||
| -rw-r--r-- | alias_server/version.py (renamed from server/version.py) | 0 | ||||
| -rw-r--r-- | alias_server/xep_0077.py (renamed from server/xep_0077.py) | 0 | ||||
| -rw-r--r-- | misc/alias (renamed from alias) | 2 | ||||
| -rw-r--r-- | misc/config.ini.sample (renamed from server/config.ini.sample) | 0 | ||||
| -rw-r--r-- | setup.py | 9 |
15 files changed, 13 insertions, 6 deletions
@@ -1 +1 @@ -See http://alias.fr.nf for more info +See http://dev.alias.im for more info diff --git a/server/README b/alias_server/README index 81ee68b..81ee68b 100644 --- a/server/README +++ b/alias_server/README diff --git a/server/__init__.py b/alias_server/__init__.py index faaaf79..40a96af 100644 --- a/server/__init__.py +++ b/alias_server/__init__.py @@ -1,3 +1 @@ # -*- coding: utf-8 -*- - - diff --git a/server/alias_plugin.py b/alias_server/alias_plugin.py index 77bcb5d..77bcb5d 100644 --- a/server/alias_plugin.py +++ b/alias_server/alias_plugin.py diff --git a/server/component.py b/alias_server/component.py index 2ae12d7..2ae12d7 100644 --- a/server/component.py +++ b/alias_server/component.py diff --git a/server/config.py b/alias_server/config.py index 74befe2..74befe2 100644 --- a/server/config.py +++ b/alias_server/config.py diff --git a/server/object.py b/alias_server/object.py index 8dd91a2..8dd91a2 100644 --- a/server/object.py +++ b/alias_server/object.py diff --git a/server/permission.py b/alias_server/permission.py index 3ce7323..3ce7323 100644 --- a/server/permission.py +++ b/alias_server/permission.py diff --git a/server/server.py b/alias_server/scripts/server index 4556fb8..554388f 100644 --- a/server/server.py +++ b/alias_server/scripts/server @@ -1,10 +1,10 @@ #!/usr/bin/python2 import logging from argparse import ArgumentParser -from config import config +from alias_server.config import config import daemon import daemon.pidfile -from component import ObjectComponent +from alias_server.component import ObjectComponent import os.path import sys diff --git a/server/user.py b/alias_server/user.py index f6800f9..f6800f9 100644 --- a/server/user.py +++ b/alias_server/user.py diff --git a/server/version.py b/alias_server/version.py index 306cebb..306cebb 100644 --- a/server/version.py +++ b/alias_server/version.py diff --git a/server/xep_0077.py b/alias_server/xep_0077.py index 0608dc5..0608dc5 100644 --- a/server/xep_0077.py +++ b/alias_server/xep_0077.py @@ -2,7 +2,7 @@ DAEMON=/usr/bin/alias-server PIDFILE=/var/run/alias.pid -CONFIG=/etc/conf.d/alias +CONFIG=/etc/alias/config.ini if [ ! -x $DAEMON ]; then echo "ERROR: Can't execute $DAEMON." diff --git a/server/config.ini.sample b/misc/config.ini.sample index 66dde3a..66dde3a 100644 --- a/server/config.ini.sample +++ b/misc/config.ini.sample diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..9bc77a9 --- /dev/null +++ b/setup.py @@ -0,0 +1,9 @@ +from distutils.core import setup +setup(name='alias', + version='0.1', + packages=['alias_server'], + scripts=['alias_server/scripts/server'], + data_files=[('/etc/rc.d/',['misc/alias']), + ('/etc/alias/',['misc/config.ini.sample']) + ] + ) |