Skip to content

Commit

Permalink
Rename directory ./src to ./lib
Browse files Browse the repository at this point in the history
  • Loading branch information
jirutka committed Dec 9, 2015
1 parent 4b8d126 commit 322eebd
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .busted
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
return {
_all = {
helper = 'spec/spec_helper',
lpath = './src/?.lua;./spec/support/?.lua;'
lpath = './lib/?.lua;./spec/support/?.lua;'
}
}
2 changes: 1 addition & 1 deletion .luacov
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ return {
-- (exclude overrules include, do not include
-- the .lua extension, path separator is always '/')
include = {
'^%./src/.*'
'^%./lib/.*'
}
}
2 changes: 1 addition & 1 deletion config.ld
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
project = 'ngx-oauth'
title = 'ngx-oauth docs'
package = 'ngx-oauth'
file = 'src'
file = 'lib'
dir = 'doc'
format = 'markdown'
10 changes: 5 additions & 5 deletions integration/nginx.conf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ events {
}

http {
lua_package_path '../src/?.lua;;';
lua_package_path '../lib/?.lua;;';

server {
listen ${port} ssl;
Expand All @@ -30,19 +30,19 @@ http {
set $$oauth_success_uri '${success_uri}';

location /_oauth/login {
content_by_lua_file '../src/ngx-oauth-login.lua';
content_by_lua_file '../lib/ngx-oauth-login.lua';
}

location /_oauth/callback {
content_by_lua_file '../src/ngx-oauth-redirect-handler.lua';
content_by_lua_file '../lib/ngx-oauth-redirect-handler.lua';
}

location /_oauth/logout {
content_by_lua_file '../src/ngx-oauth-logout.lua';
content_by_lua_file '../lib/ngx-oauth-logout.lua';
}

location /_proxy/ {
access_by_lua_file '../src/ngx-oauth-proxy.lua';
access_by_lua_file '../lib/ngx-oauth-proxy.lua';

rewrite ^/_proxy/(.*)$$ /$$1 break;
proxy_pass ${rp_base_uri};
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 12 additions & 12 deletions ngx-oauth-dev-0.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ dependencies = {
build = {
type = 'builtin',
modules = {
['ngx-oauth.config'] = 'src/ngx-oauth/config.lua',
['ngx-oauth.Cookies'] = 'src/ngx-oauth/Cookies.lua',
['ngx-oauth.crypto'] = 'src/ngx-oauth/crypto.lua',
['ngx-oauth.either'] = 'src/ngx-oauth/either.lua',
['ngx-oauth.http_client'] = 'src/ngx-oauth/http_client.lua',
['ngx-oauth.nginx'] = 'src/ngx-oauth/nginx.lua',
['ngx-oauth.oauth2'] = 'src/ngx-oauth/oauth2.lua',
['ngx-oauth.util'] = 'src/ngx-oauth/util.lua'
['ngx-oauth.config'] = 'lib/ngx-oauth/config.lua',
['ngx-oauth.Cookies'] = 'lib/ngx-oauth/Cookies.lua',
['ngx-oauth.crypto'] = 'lib/ngx-oauth/crypto.lua',
['ngx-oauth.either'] = 'lib/ngx-oauth/either.lua',
['ngx-oauth.http_client'] = 'lib/ngx-oauth/http_client.lua',
['ngx-oauth.nginx'] = 'lib/ngx-oauth/nginx.lua',
['ngx-oauth.oauth2'] = 'lib/ngx-oauth/oauth2.lua',
['ngx-oauth.util'] = 'lib/ngx-oauth/util.lua'
},
install = {
lua = {
'src/ngx-oauth-login.lua',
'src/ngx-oauth-logout.lua',
'src/ngx-oauth-proxy.lua',
'src/ngx-oauth-redirect-handler.lua'
'lib/ngx-oauth-login.lua',
'lib/ngx-oauth-logout.lua',
'lib/ngx-oauth-proxy.lua',
'lib/ngx-oauth-redirect-handler.lua'
}
},
copy_directories = { 'spec' }
Expand Down
2 changes: 1 addition & 1 deletion script/test
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ busted --shuffle --verbose --coverage
report-coverage

einfo '==> Running linter...'
luacheck src/*
luacheck lib/*

0 comments on commit 322eebd

Please sign in to comment.