Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Wolfgang Knopki
Spacedeck-open-SAML
Commits
1426bc9c
Commit
1426bc9c
authored
Apr 07, 2017
by
Martin Guether
Browse files
updated storage config
parent
bd0471da
Changes
3
Show whitespace changes
Inline
Side-by-side
config/default.json
View file @
1426bc9c
{
"endpoint"
:
"http://localhost:9666"
,
"storage_bucket"
:
"my_spacedeck_s3_bucket"
,
"storage_cdn"
:
"http://localhost:9666"
,
"storage_bucket"
:
"sdeck-development"
,
"storage_cdn"
:
"http://localhost:9123/sdeck-development"
,
"storage_endpoint"
:
"http://storage:9000"
,
"google_access"
:
""
,
"google_secret"
:
""
,
"admin_pass"
:
"very_secret_admin_password"
,
...
...
docker-compose.yml
View file @
1426bc9c
...
...
@@ -9,11 +9,14 @@ services:
-
MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
ports
:
-
9123:9000
command
:
server /export
db
:
image
:
mongo
spacedeck-open
:
environment
:
-
env=development
-
MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
-
MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
build
:
.
volumes
:
-
./:/usr/src/app
...
...
@@ -25,3 +28,7 @@ services:
-
db
-
sync
-
storage
links
:
-
storage
-
db
-
sync
\ No newline at end of file
helpers/uploader.js
View file @
1426bc9c
...
...
@@ -6,20 +6,29 @@ AWS.config.region = 'eu-central-1';
var
fs
=
require
(
'
fs
'
);
var
config
=
require
(
'
config
'
);
var
cdn
=
config
.
get
(
"
storage_cdn
"
)
var
storage_endpoint
=
'
http://storage:9000
'
;
var
cdn
=
config
.
get
(
"
storage_cdn
"
);
var
storage_endpoint
=
config
.
get
(
"
storage_endpoint
"
);
const
bucketName
=
"
sdeck-fresh-development
"
;
const
ep
=
new
AWS
.
Endpoint
(
storage_endpoint
);
AWS
.
config
.
update
(
new
AWS
.
Config
({
accessKeyId
:
process
.
env
.
MINIO_ACCESS_KEY
,
secretAccessKey
:
process
.
env
.
MINIO_SECRET_KEY
,
region
:
'
us-east-1
'
,
s3ForcePathStyle
:
true
,
signatureVersion
:
'
v4
'
}));
const
s3
=
new
AWS
.
S3
({
endpoint
:
ep
});
module
.
exports
=
{
removeFile
:
(
path
,
callback
)
=>
{
const
s3
=
new
AWS
.
S3
({
region
:
'
eu-central-1
'
});
//
const s3 = new AWS.S3({
//
region: 'eu-central-1'
//
});
const
bucket
=
config
.
get
(
"
storage_bucket
"
);
s3
.
deleteObject
({
Bucket
:
bucket
,
Key
:
path
...
...
@@ -37,7 +46,7 @@ module.exports = {
callback
({
error
:
"
missing path
"
},
null
);
return
;
}
console
.
log
(
"
[s
3
] uploading
"
,
localFilePath
,
"
to
"
,
fileName
);
console
.
log
(
"
[s
torage
] uploading
"
,
localFilePath
,
"
to
"
,
fileName
);
const
bucket
=
config
.
get
(
"
storage_bucket
"
);
const
fileStream
=
fs
.
createReadStream
(
localFilePath
);
...
...
@@ -49,9 +58,9 @@ module.exports = {
});
fileStream
.
on
(
'
open
'
,
function
()
{
// FIXME
var
s3
=
new
AWS
.
S3
({
region
:
'
eu-central-1
'
});
//
var s3 = new AWS.S3({
//
region: 'eu-central-1'
//
});
s3
.
putObject
({
Bucket
:
bucket
,
...
...
@@ -63,7 +72,7 @@ module.exports = {
console
.
error
(
err
);
callback
(
err
);
}
else
{
const
url
=
"
https://
"
+
config
.
get
(
"
storage_
cdn
"
)
+
"
/
"
+
fileName
;
const
url
=
cdn
+
"
/
"
+
fileName
;
console
.
log
(
"
[s3]
"
+
localFilePath
+
"
to
"
+
url
);
callback
(
null
,
url
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment