Navy.gif/owncast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the public dir live inside data to make volume mounting easier

Browse Source
This commit is contained in:
Gabe Kangas 2023-01-17 17:03:28 -08:00
parent e984f14089
commit 44fe52fc5a
No known key found for this signature in database
GPG Key ID: 4345B2060657F330
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/constants.go
View File

@ -27,4 +27,7 @@ var (
// CustomEmojiPath is the emoji directory.
CustomEmojiPath = filepath.Join(DataDirectory, "emoji")
// PublicFilesPath is the optional directory for hosting public files.
PublicFilesPath = filepath.Join(DataDirectory, "public")
)

2
router/router.go
View File

@ -386,7 +386,7 @@ func Start() error {
})
// Optional public static files
http.Handle("/public/", http.StripPrefix("/public/", http.FileServer(http.Dir("./public"))))
http.Handle("/public/", http.StripPrefix("/public/", http.FileServer(http.Dir(config.PublicFilesPath))))
port := config.WebServerPort
ip := config.WebServerIP

31
test/automated/api/publicstatic.test.js
View File

@ -4,7 +4,7 @@ const fs = require('fs');
const path = require('path');
const randomString = require('./lib/rand').randomString;
const publicPath = path.resolve(__dirname, '../../../public');
const publicPath = path.resolve(__dirname, '../../../data/public');
const filename = randomString() + '.txt';
const fileContent = randomString();
@ -15,12 +15,12 @@ test('random public static file does not exist', async (done) => {
});
test('public directory is writable', async (done) => {
try {
writeFileToPublic();
} catch (err) {
if (err) {
if (err.code === "ENOENT") { // path does not exist
if (err.code === 'ENOENT') {
// path does not exist
fs.mkdirSync(publicPath);
writeFileToPublic();
} else {
@ -33,25 +33,24 @@ test('public directory is writable', async (done) => {
});
test('public static file is accessible', async (done) => {
request.get('/public/' + filename).expect(200).then((res) => {
expect(res.text).toEqual(fileContent);
done();
});
request
.get('/public/' + filename)
.expect(200)
.then((res) => {
expect(res.text).toEqual(fileContent);
done();
});
});
test('public static file is persistent and not locked', async (done) => {
fs.unlink(path.join(publicPath, filename), (err) => {
if (err) { throw err; }
if (err) {
throw err;
}
});
done();
});
function writeFileToPublic() {
fs.writeFileSync(
path.join(publicPath, filename),
fileContent
);
}
fs.writeFileSync(path.join(publicPath, filename), fileContent);
}