diff options
| author | Peter Grassberger <petertheone@gmail.com> | 2016-03-24 16:58:52 (GMT) |
|---|---|---|
| committer | Peter Grassberger <petertheone@gmail.com> | 2016-03-24 16:58:52 (GMT) |
| commit | 4a79af6bf48f7543a407d86fc73ce70f39fc6d94 (patch) | |
| tree | 531cb030a69bf96246eac563db7b9a5f9d65ea71 | |
| parent | d67d45412f398b074d3cb2762d98c4139b0ab9bd (diff) | |
| parent | 6d97994a199e2cf180321c5bc7c3e1282ef477cc (diff) | |
Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.git
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | rh-bin/authtoken.json | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -31,7 +31,7 @@ LICENSE Installation ============ -# sudo aptitude install apache2 libapache2-mpm-itk libapache2-mod-perl2 libconfig-inifiles-perl libdbd-mysql-perl libjson-pp-perl libxml-quote-perl librhrd-perl libjs-jquery libjs-bootstrap rivendell-server +# sudo aptitude install apache2 libapache2-mpm-itk libapache2-mod-perl2 libjson-any-perl libxml-quote-perl librhrd-perl libjs-jquery libjs-bootstrap rivendell-server # sudo a2enmod ssl authnz_ldap perl proxy_wstunnel # sudo /etc/init.d/apache2 restart diff --git a/rh-bin/authtoken.json b/rh-bin/authtoken.json index 7b2fdba..9e4c332 100755 --- a/rh-bin/authtoken.json +++ b/rh-bin/authtoken.json @@ -59,4 +59,4 @@ $answer{'token'} = $token; print "Content-type: application/json; charset=UTF-8\n"; print "Status: $responsecode\n\n"; -print encode_json \%answer; +print JSON->new->encode(\%answer); |