From 4786e0f882bbdbb02c21c7ec6717c5a30879a748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 20 Jan 2015 17:53:20 +0100 Subject: [PATCH] Changed name for vendor folder --- _vendor/ldap/ca.crt | 13 ------------- _vendor/ldap/info.txt | 11 ----------- _vendor/ldap/ldap.csr | 11 ----------- _vendor/ldap/ldap.key | 15 --------------- _vendor/ldap/start_ldap | 3 --- grafana | 2 +- pkg/setting/setting.go | 2 +- {_vendor => vendor}/grafana.coffee | 0 {_vendor => vendor}/phantomjs/phantomjs | Bin {_vendor => vendor}/phantomjs/render.js | 0 10 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 _vendor/ldap/ca.crt delete mode 100644 _vendor/ldap/info.txt delete mode 100644 _vendor/ldap/ldap.csr delete mode 100644 _vendor/ldap/ldap.key delete mode 100755 _vendor/ldap/start_ldap rename {_vendor => vendor}/grafana.coffee (100%) rename {_vendor => vendor}/phantomjs/phantomjs (100%) rename {_vendor => vendor}/phantomjs/render.js (100%) diff --git a/_vendor/ldap/ca.crt b/_vendor/ldap/ca.crt deleted file mode 100644 index 8a87764b84c..00000000000 --- a/_vendor/ldap/ca.crt +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICATCCAWoCCQCBcXPQVut11DANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB -VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 -cyBQdHkgTHRkMB4XDTE0MTAwMjEwNTEwMVoXDTE1MTAwMjEwNTEwMVowRTELMAkG -A1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 -IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuhoM -Bj9ksUT5pkL4us+Tnm/dP4nX4yijk1jX9RjjtGVUrbA44Dy/iy8Y0/ieiUfU6Iz7 -dONkDpavoB+XMGqoYaiNltNMkiopMaNr3B3cTe1dQyRZXWxfmC3J5Llj1pukXNTd -8rn5J/IwkIvBTMnlNtPlxXEOy2QbneA0lok+H+MCAwEAATANBgkqhkiG9w0BAQsF -AAOBgQC1rKv3ejyB1ygWg8KTJNAPqrlwVXXZBH7Hb7vORXl9Bn5pSGJCx0U3HQzz -R0BOVAvEdhsKlE7gKcpe5qhINhr3G5+I495GtPQN2xsCxKbOab/p3dBvY26ZkNiG -t0GlXzKgEVwjJ3R50uE1S7s6xBV3/wvwvK4ZFnAlg3FjXNiz4A== ------END CERTIFICATE----- diff --git a/_vendor/ldap/info.txt b/_vendor/ldap/info.txt deleted file mode 100644 index 812680eebb8..00000000000 --- a/_vendor/ldap/info.txt +++ /dev/null @@ -1,11 +0,0 @@ -sudo apt-get install ldap-utils - -$> ldapadd -f bob.ldif -x -D 'cn=Manager,dc=tuleap,dc=local' -w welcome0 -adding new entry "cn=Bob Jones,ou=people,dc=tuleap,dc=local" - -$> ldapsearch -x -h 172.17.0.47 -LLL -b 'dc=tuleap,dc=local' 'cn=bob*' -dn: cn=Bob Jones,ou=people,dc=tuleap,dc=local -cn: Bob Jones -sn: Jones -objectClass: inetOrgPerson -uid: bjones diff --git a/_vendor/ldap/ldap.csr b/_vendor/ldap/ldap.csr deleted file mode 100644 index 584c48e3303..00000000000 --- a/_vendor/ldap/ldap.csr +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBhDCB7gIBADBFMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEh -MB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEB -AQUAA4GNADCBiQKBgQC6GgwGP2SxRPmmQvi6z5Oeb90/idfjKKOTWNf1GOO0ZVSt -sDjgPL+LLxjT+J6JR9TojPt042QOlq+gH5cwaqhhqI2W00ySKikxo2vcHdxN7V1D -JFldbF+YLcnkuWPWm6Rc1N3yufkn8jCQi8FMyeU20+XFcQ7LZBud4DSWiT4f4wID -AQABoAAwDQYJKoZIhvcNAQELBQADgYEAgtvMWTNqv2/v7nijSQTqGfdEMOHsFZ1o -8/p9m0ftFz0bVH4pGKxTYyOP9jorx2v1RG18jn6dMu7zbB7wy69TSjRMJ2QJx55B -5jWskGRh6BRmcvptqCRlOerbBmY+P6QNQa1zuglU6CEfAySLWOs4n+cXLe0Pyz23 -idl0QI10KNI= ------END CERTIFICATE REQUEST----- diff --git a/_vendor/ldap/ldap.key b/_vendor/ldap/ldap.key deleted file mode 100644 index c272fea70dd..00000000000 --- a/_vendor/ldap/ldap.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQC6GgwGP2SxRPmmQvi6z5Oeb90/idfjKKOTWNf1GOO0ZVStsDjg -PL+LLxjT+J6JR9TojPt042QOlq+gH5cwaqhhqI2W00ySKikxo2vcHdxN7V1DJFld -bF+YLcnkuWPWm6Rc1N3yufkn8jCQi8FMyeU20+XFcQ7LZBud4DSWiT4f4wIDAQAB -AoGBAJnRXY7sZrV+ZTnesOb3GvQhUaVqsV24ATuQey7B27MG7e6BcQEmNMs9qi/J -ln+xN3De1hfOuqy0L4URl00VWwWytEEB+7zV6kytx+PPQgPqgOTCmVAK5G1+W5TZ -hpv05cw2B9FeFlzArkI/ZsmIa3aXd04yzdtdqitfzowc+sSBAkEA7hmxjqljpmPY -R3fFTkP07CtGdG1Fzx3uxLJ9rkpIMTRCyPp+YGhGCGWTysnnfKSkWdj3eCPEwxVG -puxNRGqLOwJBAMgXoDNf2cdM9IYp66z5FYiGuAxywL+twP1e2FSojyfGCOa0MmwO -NBzu7d5M/UHPfgI1KDX1lUNY8mrgtfN343kCQQDqwvao/Sc95fBX9yXZl3OkcL7V -CPDt2EuWMY9uC9vGeArpcuKsV+PFX7IrHoxZ/1P1KtJF6K6W0yGIcDF3Jb4FAkBL -8wvP9FYJnGBEfK0EXxeZVumNcBFRsHZMti+PEtwj0LuYNlXdRhbp1JddhgOrc0L1 -O5Ajyy/4/E4n21u1KpChAkEAyoQECk7yfs6SUDyQy2A6YBroAIEMjUS2Ttwtxr+b -N5Q6kbRwHHNXoUyCaow8CAeXRji1PCuLqKtwpbs+BVd83w== ------END RSA PRIVATE KEY----- diff --git a/_vendor/ldap/start_ldap b/_vendor/ldap/start_ldap deleted file mode 100755 index bdf57dcc36e..00000000000 --- a/_vendor/ldap/start_ldap +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker run -p 389:389 -d -v /var/docker/ldap:/data enalean/ldap-dev diff --git a/grafana b/grafana index 9667f324f1d..3bf7f6ed5fa 160000 --- a/grafana +++ b/grafana @@ -1 +1 @@ -Subproject commit 9667f324f1db66f7cdfa7ce5b6c9b38c92f41d53 +Subproject commit 3bf7f6ed5fa348d7983a4ae3bf17d280d5a5ed13 diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 1e79fe8fc6b..382d67284c5 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -181,7 +181,7 @@ func NewConfigContext() { // PhantomJS rendering ImagesDir = "data/png" - PhantomDir = "_vendor/phantomjs" + PhantomDir = "vendor/phantomjs" LogRootPath = Cfg.MustValue("log", "root_path", path.Join(WorkDir, "/data/log")) diff --git a/_vendor/grafana.coffee b/vendor/grafana.coffee similarity index 100% rename from _vendor/grafana.coffee rename to vendor/grafana.coffee diff --git a/_vendor/phantomjs/phantomjs b/vendor/phantomjs/phantomjs similarity index 100% rename from _vendor/phantomjs/phantomjs rename to vendor/phantomjs/phantomjs diff --git a/_vendor/phantomjs/render.js b/vendor/phantomjs/render.js similarity index 100% rename from _vendor/phantomjs/render.js rename to vendor/phantomjs/render.js