Merge branch 'master' of /home/vorner/pciids

Conflicts:

	scripts/pciids-export

diff --git a/PciIds/Startup.pm b/PciIds/Startup.pm
index ee7d9dba96d1645325dbf202f83bea57e1462646..2bacade7178c57faf0077df25889bc3e2d79fd74 100644 (file)
--- a/PciIds/Startup.pm
+++ b/PciIds/Startup.pm
@@ -22,10 +22,10 @@ use warnings;
 use base 'Exporter';
 
 #Where are data?
-our $directory = '/home/vorner/prog/pciids/';
+our $directory = '/home/pciids/ids/perl/';
 our @EXPORT=qw($directory);
 
 #Where are the modules?
-use lib ( '/home/vorner/prog/pciids/' );
+use lib ( '/home/pciids/ids/perl/' );
 
 1;

diff --git a/cf/config b/cf/config
index 0b103179d0d809afe29d1a525ccda091b0ac7600..e7752f4037dc6f13415dd6e92c3b3c74db3bd92f 100644 (file)
--- a/cf/config
+++ b/cf/config
@@ -1,13 +1,13 @@
-db = pciids
-dbuser = pciids
-dbpasswd = 1234
-passwdsalt = 1234
-regmailsalt = 1234
-authsalt = 1234
-from_addr = vorner+pciids@ucw.cz
-sendmail = /home/vorner/bin/sendmail-apache
-logfile = /home/vorner/prog/pciids/pciids.log
-hostname = localhost
-jelnet = /home/vorner/bin/jelnet
-xmpp_passwd = 1234
-xmpp_name = none
+dbname = pciids2
+dbuser = pciids2
+dbpasswd = ZaseChciplyKun?
+passwdsalt = OSNTOomONTHplrchluhcSONUNSt
+regmailsalt = SNTOHmjsaontmsthoseuhtlrc,'E<<<ua'.LRCHlrchhhewl',rca'a"Hhhhhlr',h
+authsalt = ANSTHh'othal'cllal"<H>Lsnahtuoesnth'n,.hWLhl'rgp348gSTHl',crnTHOSNTJHSntahOSTHWLRc'h,l.
+from_addr = pci-ids+www@ucw.cz
+sendmail = /usr/sbin/sendmail
+logfile = /home/pciids/ids/log/ids.log
+hostname = pci-ids.ucw.cz
+jelnet = /home/pciids/ids/perl/scripts/jelnet
+xmpp_passwd = IorekByrnison
+xmpp_name = pci-ids@ucw.cz

diff --git a/scripts/pciids-export b/scripts/pciids-export
index 695a0c33dfbd8a0ddb48cdae25fdc6cbdaeb14d1..53a4477c40eb341203c99efca1d5a13fff9e359f 100755 (executable)
--- a/scripts/pciids-export
+++ b/scripts/pciids-export
@@ -30,7 +30,7 @@ if ! [ -f docs/pci.ids ] || ! cmp docs/pci.ids pci.ids.new >/dev/null ; then
        echo '# Current to date: '`date +%Y%m%d` >> pci.ids.final
        echo >> pci.ids.final
        cat pci.ids.new >> pci.ids.final
-       ln -f pci.ids.final ~/origs/00-current
+#      ln -f pci.ids.final ~/origs/00-current
        ln -f pci.ids.final docs/pci.ids
        rm pci.ids.final
        bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2