replace BASE_URL by REMARK_URL in runtime

This commit is contained in:
igoradamenko
2018-04-14 21:41:51 +03:00
parent bb12630ee5
commit d3043c0ab0
6 changed files with 11 additions and 10 deletions
Regular → Executable
+4
View File
@@ -2,5 +2,9 @@
echo "prepare environment"
# replace base url by REMARK_URL
sed -i "s|BASE_URL:\"[^\"]*\"|BASE_URL:\"${REMARK_URL}\"|g" /srv/web/*.js
sed -i "s|var baseurl = '[^']*';|var baseurl = '${REMARK_URL}';|g" /srv/web/*.html
echo "start remark42 server"
/sbin/su-exec umputun /srv/remark server
+1 -1
View File
@@ -1,4 +1,4 @@
const BASE_URL = process.env.BASE_URL;
const BASE_URL = '/';
const API_BASE = '/api/v1';
const NODE_ID = 'remark42';
const COUNTER_NODE_CLASSNAME = 'remark42__counter';
+2 -1
View File
@@ -44,7 +44,8 @@
(function() {
var d = document, s = d.createElement('script');
s.src = '<%= htmlWebpackPlugin.options.baseUrl %>/web/counter.js';
var baseurl = '';
s.src = baseurl + '/web/counter.js';
s.type = 'text/javascript';
(d.head || d.body).appendChild(s);
})();
+2 -1
View File
@@ -30,7 +30,8 @@
(function() {
var d = document, s = d.createElement('script');
s.src = '<%= htmlWebpackPlugin.options.baseUrl %>/web/embed.js';
var baseurl = '';
s.src = baseurl + '/web/embed.js';
s.type = 'text/javascript';
(d.head || d.body).appendChild(s);
})();
+2 -1
View File
@@ -29,7 +29,8 @@
(function() {
var d = document, s = d.createElement('script');
s.src = '<%= htmlWebpackPlugin.options.baseUrl %>/web/last-comments.js';
var baseurl = '';
s.src = baseurl + '/web/last-comments.js';
s.type = 'text/javascript';
(d.head || d.body).appendChild(s);
})();
-6
View File
@@ -11,11 +11,9 @@ const Define = webpack.DefinePlugin;
const { NODE_ID } = require('./app/common/constants');
const publicFolder = path.resolve(__dirname, 'public');
const env = process.env.NODE_ENV || 'dev';
const url = process.env.REMARK_URL || 'https://demo.remark42.com';
// let's log some env variables because we can
console.log(`NODE_ENV = ${env}`);
console.log(`REMARK_URL = ${url}`);
const commonStyleLoaders = [
'css-loader',
@@ -102,27 +100,23 @@ module.exports = {
}),
new Define({
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
'process.env.BASE_URL': JSON.stringify(url),
}),
// TODO: we should add it only on demo serv
new Html({
template: path.resolve(__dirname, 'index.ejs'),
inject: false,
baseUrl: url,
}),
// TODO: we should add it only on demo serv
new Html({
template: path.resolve(__dirname, 'counter.ejs'),
filename: 'counter.html',
inject: false,
baseUrl: url,
}),
// TODO: we should add it only on demo serv
new Html({
template: path.resolve(__dirname, 'last-comments.ejs'),
filename: 'last-comments.html',
inject: false,
baseUrl: url,
}),
...(env === 'production' ? [] : [new Html({
template: path.resolve(__dirname, 'dev.ejs'),