rooty/yubikey-ksm
1
0
Fork 0
mirror of https://github.com/Yubico/yubikey-ksm.git synced 2025-01-31 16:52:12 +01:00
Code Issues Projects Releases Wiki Activity

Use yubikey-ksm instead of ykksm in paths, configuration in /etc/yubico/ksm

Browse Source
This commit is contained in:
Dain Nilsson 2013-01-28 12:11:23 +01:00
parent 5797d005fc
commit dcc017f5af
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -46,10 +46,10 @@ all:
# Installation rules.
etcprefix = /etc/ykksm
etcprefix = /etc/yubico/ksm
binprefix = /usr/bin
phpprefix = /usr/share/ykksm
docprefix = /usr/share/doc/ykksm
phpprefix = /usr/share/yubikey-ksm
docprefix = /usr/share/doc/yubikey-ksm
wwwgroup = www-data
install: $(MANS)

6
NEWS
View File

@ -1,5 +1,9 @@
* Version 1.10 (unreleased)
* Changed location of files to /usr/share/yubikey-ksm, etc.
* Changed location of configuration files to /etc/yubico/ksm/.
* Version 1.9 (released 2013-01-23)
* Renamed hex2bin to yubi_hex2bin.
@ -18,7 +22,7 @@
Issue #5 reported by Gyula Szabó, see:
http://code.google.com/p/yubikey-ksm/issues/detail?id=5>.
* Read database config from /etc/ykksm/config-db files,
* Read database config from /etc/yubico/ksm/config-db files,
as generated by dbconfig.
* Version 1.6 (released 2012-12-18)

2
doc

@ -1 +1 @@
Subproject commit bfda50b698334a92d5f0824e5cf94394ce6c5707
Subproject commit b102d2b5d107d9f6ee3bdc126e5ec0db689dbbb6

4
ykksm-checksum
View File

@ -57,8 +57,8 @@ sub usage {
#Support dbconfig-common generated database settings, if available
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
if( -e '/etc/ykksm/config-db.cfg' ) {
require '/etc/ykksm/config-db.cfg';
if( -e '/etc/yubico/ksm/config-db.cfg' ) {
require '/etc/yubico/ksm/config-db.cfg';
} else {
$dbtype = 'mysql';
$dbname = 'ykksm';

4
ykksm-config.php
View File

@ -1,7 +1,7 @@
<?php
//ykksm will use the configuration stored in /etc/ykksm/config-db.php, if that file exists. If it does not exist, the below values will be used.
//ykksm will use the configuration stored in /etc/yubico/ksm/config-db.php, if that file exists. If it does not exist, the below values will be used.
if(!include '/etc/ykksm/config-db.php') {
if(!include '/etc/yubico/ksm/config-db.php') {
$dbuser='ykksmreader';
$dbpass='yourpassword';
$basepath='';

4
ykksm-export
View File

@ -55,8 +55,8 @@ sub usage {
#Support dbconfig-common generated database settings, if available
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
if( -e '/etc/ykksm/config-db.cfg' ) {
require '/etc/ykksm/config-db.cfg';
if( -e '/etc/yubico/ksm/config-db.cfg' ) {
require '/etc/yubico/ksm/config-db.cfg';
} else {
$dbtype = 'mysql';
$dbname = 'ykksm';

4
ykksm-import
View File

@ -59,8 +59,8 @@ sub usage {
#Support dbconfig-common generated database settings, if available
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
if( -e '/etc/ykksm/config-db.cfg' ) {
require '/etc/ykksm/config-db.cfg';
if( -e '/etc/yubico/ksm/config-db.cfg' ) {
require '/etc/yubico/ksm/config-db.cfg';
} else {
$dbtype = 'mysql';
$dbname = 'ykksm';