summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorokfprojz <jules+okfprojz@okfoc.us>2016-04-11 14:45:24 -0400
committerokfprojz <jules+okfprojz@okfoc.us>2016-04-11 14:45:24 -0400
commit6f3d4cc8c61668e216430aca0060094693cf8b6e (patch)
treef36baec4d1422cbdaa7e6fd925fc676bc5136dda
parent2b84b036311a2ab7a2e49132fa535b38444361ca (diff)
parent413546aecb1f8bf103e88f799ca8cb77da1df210 (diff)
Merge branch 'master' of github.com:okfocus/portfolio
-rw-r--r--index.js6
-rw-r--r--package.json2
2 files changed, 6 insertions, 2 deletions
diff --git a/index.js b/index.js
index c826359..fe51393 100644
--- a/index.js
+++ b/index.js
@@ -62,7 +62,11 @@ var app = okcms.createApp({
key: process.env.S3_KEY,
secret: process.env.S3_SECRET,
bucket: process.env.S3_BUCKET,
- maxbytes: 1024*1024*2,
+ dirname: "portfolio",
+ image: { allowed: true, preserveFilename: false, maxbytes: 2*1024*1024 },
+ video: { allowed: true, preserveFilename: true, maxbytes: 200*1024*1024 },
+ audio: { allowed: true, preserveFilename: true, maxbytes: 100*1024*1024 },
+
},
}
diff --git a/package.json b/package.json
index 201d764..4c12dcf 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"dependencies": {
"dotenv": "^2.0.0",
"object-assign": "^2.0.0",
- "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.28"
+ "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.29"
},
"devDependencies": {
"grunt": "^0.4.5",