Changeset 1b48afb

Timestamp:

2009-04-29T17:24:18Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

c9348c4

Parents:

b9f2894

Message:

add support for user-wide config files

in the past the config file was expected in /etc/skyped, change this to
~/.skyped, and just fall back to the previous path if it's not
available.

Location:

skype

Files:

• README (modified) (2 diffs)
• skyped.py (modified) (1 diff)

skype/README

@@ -166 +166 @@
 === Configuring
 
-- Edit `/usr/local/etc/skyped/skyped.conf`: adjust `username` and `password`. The
-  `username` should be your Skype login and the `password` can be whatever you
-  want, but you will have to specify that one when adding the Skype account to
-  BitlBee (see later).
+- Set up `~/.skyped/skyped.conf`: Create the `~/.skyped` directory, copy
+  `skyped.conf` and `skyped.cnf` from
+  `/usr/local/etc/skyped/skyped.conf` to `~/.skyped`, adjust `username`
+  and `password`. The `username` should be your Skype login and the
+  `password` can be whatever you want, but you will have to specify that
+  one when adding the Skype account to BitlBee (see later).
 
 NOTE: Here, and later - `/usr/local/etc` can be different on your installation
@@ -177 +179 @@
 
 ----
-# cd /usr/local/etc/skyped
+# cd ~/.skyped
 # openssl req -new -x509 -days 365 -nodes -config skyped.cnf -out skyped.cert.pem \
         -keyout skyped.key.pem
 ----
 
-NOTE: Maybe you want to adjust the permissions in the `/usr/local/etc/skyped`
+NOTE: Maybe you want to adjust the permissions in the `~/.skyped`
 dir. For example make it readable by just your user.
 

skype/skyped.py

@@ -206 +206 @@
 class Options:
         def __init__(self):
-                self.cfgpath = "/usr/local/etc/skyped/skyped.conf"
+                self.cfgpath = os.path.join(os.environ['HOME'], ".skyped", "skyped.conf")
+                if not os.path.exists(self.cfgpath):
+                        self.cfgpath = "/usr/local/etc/skyped/skyped.conf"
                 self.daemon = True
                 self.debug = False