diff --git a/.gitignore b/.gitignore index 573fa1e..b6b7241 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .*.sw* +.dat # Logs logs diff --git a/README.md b/README.md index 55fb345..7991636 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Initialization needs to know its primary domain ``` -POST https://api./api/com.daplie.walnut.init +POST https://api./api/walnut@daplie.com/init { "domain": "" } ``` @@ -171,7 +171,7 @@ Resetting the Initialization Once you run the app the initialization files will appear in these locations ``` -/srv/walnut/var/com.daplie.walnut.config.sqlite3 +/srv/walnut/var/walnut+config@daplie.com.sqlite3 /srv/walnut/config//config.json ``` diff --git a/lib/apis.js b/lib/apis.js index 5e9542d..7229fb2 100644 --- a/lib/apis.js +++ b/lib/apis.js @@ -137,14 +137,14 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) { req.oauth3.accountIdx = accountIdx; req.oauth3.ppid = ppid; req.oauth3.accountHash = crypto.createHash('sha1').update(accountIdx).digest('hex'); - //console.log('[com.daplie.walnut] accountIdx:', accountIdx); - //console.log('[com.daplie.walnut] ppid:', ppid); + //console.log('[walnut@daplie.com] accountIdx:', accountIdx); + //console.log('[walnut@daplie.com] ppid:', ppid); next(); }); }); - rejectableRequest(req, res, promise, "[com.daplie.walnut] attach account by id"); + rejectableRequest(req, res, promise, "[walnut@daplie.com] attach account by id"); } function accountRequired(req, res, next) { @@ -165,7 +165,7 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) { req , res , PromiseA.reject(new Error("this secure resource requires an access token")) - , "[com.daplie.walnut] required account (not /public)" + , "[walnut@daplie.com] required account (not /public)" ); return; } @@ -207,7 +207,7 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) { }); }); - rejectableRequest(req, res, promise, "[com.daplie.walnut] required account (not /public)"); + rejectableRequest(req, res, promise, "[walnut@daplie.com] required account (not /public)"); } function loadRestHelper(myConf, clientUrih, pkgId) { @@ -812,7 +812,7 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) { }); } }); - rejectableRequest(req, res, promise, "[com.daplie.walnut] load api package"); + rejectableRequest(req, res, promise, "[walnut@daplie.com] load api package"); }); }; }; diff --git a/lib/com.daplie.walnut/.dat/content.bitfield b/lib/com.daplie.walnut/.dat/content.bitfield deleted file mode 100644 index 22c8edb..0000000 Binary files a/lib/com.daplie.walnut/.dat/content.bitfield and /dev/null differ diff --git a/lib/com.daplie.walnut/.dat/content.key b/lib/com.daplie.walnut/.dat/content.key deleted file mode 100644 index ae0fa8f..0000000 --- a/lib/com.daplie.walnut/.dat/content.key +++ /dev/null @@ -1 +0,0 @@ -L)]l"T:Q2z֩E= 0 \ No newline at end of file diff --git a/lib/com.daplie.walnut/.dat/content.secret_key b/lib/com.daplie.walnut/.dat/content.secret_key deleted file mode 100644 index e69de29..0000000 diff --git a/lib/com.daplie.walnut/.dat/content.signatures b/lib/com.daplie.walnut/.dat/content.signatures deleted file mode 100644 index 57925f0..0000000 Binary files a/lib/com.daplie.walnut/.dat/content.signatures and /dev/null differ diff --git a/lib/com.daplie.walnut/.dat/content.tree b/lib/com.daplie.walnut/.dat/content.tree deleted file mode 100644 index f601e09..0000000 Binary files a/lib/com.daplie.walnut/.dat/content.tree and /dev/null differ diff --git a/lib/com.daplie.walnut/.dat/metadata.bitfield b/lib/com.daplie.walnut/.dat/metadata.bitfield deleted file mode 100644 index effdb2c..0000000 Binary files a/lib/com.daplie.walnut/.dat/metadata.bitfield and /dev/null differ diff --git a/lib/com.daplie.walnut/.dat/metadata.data b/lib/com.daplie.walnut/.dat/metadata.data deleted file mode 100644 index fe21999..0000000 Binary files a/lib/com.daplie.walnut/.dat/metadata.data and /dev/null differ diff --git a/lib/com.daplie.walnut/.dat/metadata.key b/lib/com.daplie.walnut/.dat/metadata.key deleted file mode 100644 index fc13ced..0000000 --- a/lib/com.daplie.walnut/.dat/metadata.key +++ /dev/null @@ -1 +0,0 @@ -+7x^qG,Zymr(ڷ \ No newline at end of file diff --git a/lib/com.daplie.walnut/.dat/metadata.latest b/lib/com.daplie.walnut/.dat/metadata.latest deleted file mode 100644 index 1cf91b4..0000000 Binary files a/lib/com.daplie.walnut/.dat/metadata.latest and /dev/null differ diff --git a/lib/com.daplie.walnut/.dat/metadata.ogd b/lib/com.daplie.walnut/.dat/metadata.ogd deleted file mode 100644 index e69de29..0000000 diff --git a/lib/com.daplie.walnut/.dat/metadata.signatures b/lib/com.daplie.walnut/.dat/metadata.signatures deleted file mode 100644 index d2af0b6..0000000 Binary files a/lib/com.daplie.walnut/.dat/metadata.signatures and /dev/null differ diff --git a/lib/com.daplie.walnut/.dat/metadata.tree b/lib/com.daplie.walnut/.dat/metadata.tree deleted file mode 100644 index 688ce57..0000000 Binary files a/lib/com.daplie.walnut/.dat/metadata.tree and /dev/null differ diff --git a/lib/main.js b/lib/main.js index 46f0ad0..c3d3515 100644 --- a/lib/main.js +++ b/lib/main.js @@ -58,8 +58,8 @@ module.exports.create = function (app, xconfx, apiFactories, apiDeps, errorIfApi } if (!setupApp) { - //setupApp = express.static(path.join(xconfx.staticpath, 'com.daplie.walnut')); - setupApp = express.static(path.join(__dirname, 'com.daplie.walnut')); + //setupApp = express.static(path.join(xconfx.staticpath, 'walnut@daplie.com')); + setupApp = express.static(path.join(__dirname, 'walnut@daplie.com', 'setup')); } setupApp(req, res, function () { if ('/' === req.url) { diff --git a/lib/com.daplie.walnut/Brown-Bold.otf b/lib/walnut@daplie.com/setup/Brown-Bold.otf similarity index 100% rename from lib/com.daplie.walnut/Brown-Bold.otf rename to lib/walnut@daplie.com/setup/Brown-Bold.otf diff --git a/lib/com.daplie.walnut/Brown-Light.otf b/lib/walnut@daplie.com/setup/Brown-Light.otf similarity index 100% rename from lib/com.daplie.walnut/Brown-Light.otf rename to lib/walnut@daplie.com/setup/Brown-Light.otf diff --git a/lib/com.daplie.walnut/Brown-Regular.otf b/lib/walnut@daplie.com/setup/Brown-Regular.otf similarity index 100% rename from lib/com.daplie.walnut/Brown-Regular.otf rename to lib/walnut@daplie.com/setup/Brown-Regular.otf diff --git a/lib/com.daplie.walnut/Myriad-Pro_31655.ttf b/lib/walnut@daplie.com/setup/Myriad-Pro_31655.ttf similarity index 100% rename from lib/com.daplie.walnut/Myriad-Pro_31655.ttf rename to lib/walnut@daplie.com/setup/Myriad-Pro_31655.ttf diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.css b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.css similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.css rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.css diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.css.map b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.css.map rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.css.map diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.min.css b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.min.css rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.min.css diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.min.css.map b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.min.css.map similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap-theme.min.css.map rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap-theme.min.css.map diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap.css b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.css similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap.css rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.css diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap.css.map b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.css.map similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap.css.map rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.css.map diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap.min.css b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.min.css similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap.min.css rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.min.css diff --git a/lib/com.daplie.walnut/bootstrap/css/bootstrap.min.css.map b/lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from lib/com.daplie.walnut/bootstrap/css/bootstrap.min.css.map rename to lib/walnut@daplie.com/setup/bootstrap/css/bootstrap.min.css.map diff --git a/lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.eot b/lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.eot rename to lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.svg b/lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.svg rename to lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.ttf b/lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.woff b/lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.woff rename to lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from lib/com.daplie.walnut/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to lib/walnut@daplie.com/setup/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/lib/com.daplie.walnut/bootstrap/js/bootstrap.js b/lib/walnut@daplie.com/setup/bootstrap/js/bootstrap.js similarity index 100% rename from lib/com.daplie.walnut/bootstrap/js/bootstrap.js rename to lib/walnut@daplie.com/setup/bootstrap/js/bootstrap.js diff --git a/lib/com.daplie.walnut/bootstrap/js/bootstrap.min.js b/lib/walnut@daplie.com/setup/bootstrap/js/bootstrap.min.js similarity index 100% rename from lib/com.daplie.walnut/bootstrap/js/bootstrap.min.js rename to lib/walnut@daplie.com/setup/bootstrap/js/bootstrap.min.js diff --git a/lib/com.daplie.walnut/bootstrap/js/npm.js b/lib/walnut@daplie.com/setup/bootstrap/js/npm.js similarity index 100% rename from lib/com.daplie.walnut/bootstrap/js/npm.js rename to lib/walnut@daplie.com/setup/bootstrap/js/npm.js diff --git a/lib/com.daplie.walnut/icons/acrobat-file.png b/lib/walnut@daplie.com/setup/icons/acrobat-file.png similarity index 100% rename from lib/com.daplie.walnut/icons/acrobat-file.png rename to lib/walnut@daplie.com/setup/icons/acrobat-file.png diff --git a/lib/com.daplie.walnut/icons/files.png b/lib/walnut@daplie.com/setup/icons/files.png similarity index 100% rename from lib/com.daplie.walnut/icons/files.png rename to lib/walnut@daplie.com/setup/icons/files.png diff --git a/lib/com.daplie.walnut/icons/folder-plus.png b/lib/walnut@daplie.com/setup/icons/folder-plus.png similarity index 100% rename from lib/com.daplie.walnut/icons/folder-plus.png rename to lib/walnut@daplie.com/setup/icons/folder-plus.png diff --git a/lib/com.daplie.walnut/icons/folder.svg b/lib/walnut@daplie.com/setup/icons/folder.svg similarity index 100% rename from lib/com.daplie.walnut/icons/folder.svg rename to lib/walnut@daplie.com/setup/icons/folder.svg diff --git a/lib/com.daplie.walnut/icons/image-file.png b/lib/walnut@daplie.com/setup/icons/image-file.png similarity index 100% rename from lib/com.daplie.walnut/icons/image-file.png rename to lib/walnut@daplie.com/setup/icons/image-file.png diff --git a/lib/com.daplie.walnut/icons/line-item.png b/lib/walnut@daplie.com/setup/icons/line-item.png similarity index 100% rename from lib/com.daplie.walnut/icons/line-item.png rename to lib/walnut@daplie.com/setup/icons/line-item.png diff --git a/lib/com.daplie.walnut/icons/music.png b/lib/walnut@daplie.com/setup/icons/music.png similarity index 100% rename from lib/com.daplie.walnut/icons/music.png rename to lib/walnut@daplie.com/setup/icons/music.png diff --git a/lib/com.daplie.walnut/icons/network.png b/lib/walnut@daplie.com/setup/icons/network.png similarity index 100% rename from lib/com.daplie.walnut/icons/network.png rename to lib/walnut@daplie.com/setup/icons/network.png diff --git a/lib/com.daplie.walnut/icons/notifications.png b/lib/walnut@daplie.com/setup/icons/notifications.png similarity index 100% rename from lib/com.daplie.walnut/icons/notifications.png rename to lib/walnut@daplie.com/setup/icons/notifications.png diff --git a/lib/com.daplie.walnut/icons/photos.png b/lib/walnut@daplie.com/setup/icons/photos.png similarity index 100% rename from lib/com.daplie.walnut/icons/photos.png rename to lib/walnut@daplie.com/setup/icons/photos.png diff --git a/lib/com.daplie.walnut/icons/profile.png b/lib/walnut@daplie.com/setup/icons/profile.png similarity index 100% rename from lib/com.daplie.walnut/icons/profile.png rename to lib/walnut@daplie.com/setup/icons/profile.png diff --git a/lib/com.daplie.walnut/icons/search.png b/lib/walnut@daplie.com/setup/icons/search.png similarity index 100% rename from lib/com.daplie.walnut/icons/search.png rename to lib/walnut@daplie.com/setup/icons/search.png diff --git a/lib/com.daplie.walnut/icons/settings.png b/lib/walnut@daplie.com/setup/icons/settings.png similarity index 100% rename from lib/com.daplie.walnut/icons/settings.png rename to lib/walnut@daplie.com/setup/icons/settings.png diff --git a/lib/com.daplie.walnut/icons/shared1.png b/lib/walnut@daplie.com/setup/icons/shared1.png similarity index 100% rename from lib/com.daplie.walnut/icons/shared1.png rename to lib/walnut@daplie.com/setup/icons/shared1.png diff --git a/lib/com.daplie.walnut/icons/shared2.png b/lib/walnut@daplie.com/setup/icons/shared2.png similarity index 100% rename from lib/com.daplie.walnut/icons/shared2.png rename to lib/walnut@daplie.com/setup/icons/shared2.png diff --git a/lib/com.daplie.walnut/icons/storage-usage.png b/lib/walnut@daplie.com/setup/icons/storage-usage.png similarity index 100% rename from lib/com.daplie.walnut/icons/storage-usage.png rename to lib/walnut@daplie.com/setup/icons/storage-usage.png diff --git a/lib/com.daplie.walnut/icons/text-file.png b/lib/walnut@daplie.com/setup/icons/text-file.png similarity index 100% rename from lib/com.daplie.walnut/icons/text-file.png rename to lib/walnut@daplie.com/setup/icons/text-file.png diff --git a/lib/com.daplie.walnut/icons/three-dots.png b/lib/walnut@daplie.com/setup/icons/three-dots.png similarity index 100% rename from lib/com.daplie.walnut/icons/three-dots.png rename to lib/walnut@daplie.com/setup/icons/three-dots.png diff --git a/lib/com.daplie.walnut/icons/thumbnail-grid.png b/lib/walnut@daplie.com/setup/icons/thumbnail-grid.png similarity index 100% rename from lib/com.daplie.walnut/icons/thumbnail-grid.png rename to lib/walnut@daplie.com/setup/icons/thumbnail-grid.png diff --git a/lib/com.daplie.walnut/images/IMG_0145.png b/lib/walnut@daplie.com/setup/images/IMG_0145.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0145.png rename to lib/walnut@daplie.com/setup/images/IMG_0145.png diff --git a/lib/com.daplie.walnut/images/IMG_0146.png b/lib/walnut@daplie.com/setup/images/IMG_0146.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0146.png rename to lib/walnut@daplie.com/setup/images/IMG_0146.png diff --git a/lib/com.daplie.walnut/images/IMG_0147.png b/lib/walnut@daplie.com/setup/images/IMG_0147.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0147.png rename to lib/walnut@daplie.com/setup/images/IMG_0147.png diff --git a/lib/com.daplie.walnut/images/IMG_0148.png b/lib/walnut@daplie.com/setup/images/IMG_0148.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0148.png rename to lib/walnut@daplie.com/setup/images/IMG_0148.png diff --git a/lib/com.daplie.walnut/images/IMG_0149.png b/lib/walnut@daplie.com/setup/images/IMG_0149.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0149.png rename to lib/walnut@daplie.com/setup/images/IMG_0149.png diff --git a/lib/com.daplie.walnut/images/IMG_0150.png b/lib/walnut@daplie.com/setup/images/IMG_0150.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0150.png rename to lib/walnut@daplie.com/setup/images/IMG_0150.png diff --git a/lib/com.daplie.walnut/images/IMG_0151.png b/lib/walnut@daplie.com/setup/images/IMG_0151.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0151.png rename to lib/walnut@daplie.com/setup/images/IMG_0151.png diff --git a/lib/com.daplie.walnut/images/IMG_0152.png b/lib/walnut@daplie.com/setup/images/IMG_0152.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0152.png rename to lib/walnut@daplie.com/setup/images/IMG_0152.png diff --git a/lib/com.daplie.walnut/images/IMG_0153.png b/lib/walnut@daplie.com/setup/images/IMG_0153.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0153.png rename to lib/walnut@daplie.com/setup/images/IMG_0153.png diff --git a/lib/com.daplie.walnut/images/IMG_0154.png b/lib/walnut@daplie.com/setup/images/IMG_0154.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0154.png rename to lib/walnut@daplie.com/setup/images/IMG_0154.png diff --git a/lib/com.daplie.walnut/images/IMG_0155.png b/lib/walnut@daplie.com/setup/images/IMG_0155.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0155.png rename to lib/walnut@daplie.com/setup/images/IMG_0155.png diff --git a/lib/com.daplie.walnut/images/IMG_0156.png b/lib/walnut@daplie.com/setup/images/IMG_0156.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0156.png rename to lib/walnut@daplie.com/setup/images/IMG_0156.png diff --git a/lib/com.daplie.walnut/images/IMG_0157.png b/lib/walnut@daplie.com/setup/images/IMG_0157.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0157.png rename to lib/walnut@daplie.com/setup/images/IMG_0157.png diff --git a/lib/com.daplie.walnut/images/IMG_0158.png b/lib/walnut@daplie.com/setup/images/IMG_0158.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0158.png rename to lib/walnut@daplie.com/setup/images/IMG_0158.png diff --git a/lib/com.daplie.walnut/images/IMG_0159.png b/lib/walnut@daplie.com/setup/images/IMG_0159.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0159.png rename to lib/walnut@daplie.com/setup/images/IMG_0159.png diff --git a/lib/com.daplie.walnut/images/IMG_0160.png b/lib/walnut@daplie.com/setup/images/IMG_0160.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0160.png rename to lib/walnut@daplie.com/setup/images/IMG_0160.png diff --git a/lib/com.daplie.walnut/images/IMG_0161.png b/lib/walnut@daplie.com/setup/images/IMG_0161.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0161.png rename to lib/walnut@daplie.com/setup/images/IMG_0161.png diff --git a/lib/com.daplie.walnut/images/IMG_0162.png b/lib/walnut@daplie.com/setup/images/IMG_0162.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0162.png rename to lib/walnut@daplie.com/setup/images/IMG_0162.png diff --git a/lib/com.daplie.walnut/images/IMG_0163.png b/lib/walnut@daplie.com/setup/images/IMG_0163.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0163.png rename to lib/walnut@daplie.com/setup/images/IMG_0163.png diff --git a/lib/com.daplie.walnut/images/IMG_0164.png b/lib/walnut@daplie.com/setup/images/IMG_0164.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0164.png rename to lib/walnut@daplie.com/setup/images/IMG_0164.png diff --git a/lib/com.daplie.walnut/images/IMG_0165.png b/lib/walnut@daplie.com/setup/images/IMG_0165.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0165.png rename to lib/walnut@daplie.com/setup/images/IMG_0165.png diff --git a/lib/com.daplie.walnut/images/IMG_0166.png b/lib/walnut@daplie.com/setup/images/IMG_0166.png similarity index 100% rename from lib/com.daplie.walnut/images/IMG_0166.png rename to lib/walnut@daplie.com/setup/images/IMG_0166.png diff --git a/lib/com.daplie.walnut/images/alissa.png b/lib/walnut@daplie.com/setup/images/alissa.png similarity index 100% rename from lib/com.daplie.walnut/images/alissa.png rename to lib/walnut@daplie.com/setup/images/alissa.png diff --git a/lib/com.daplie.walnut/images/folder1.png b/lib/walnut@daplie.com/setup/images/folder1.png similarity index 100% rename from lib/com.daplie.walnut/images/folder1.png rename to lib/walnut@daplie.com/setup/images/folder1.png diff --git a/lib/com.daplie.walnut/images/folder2.png b/lib/walnut@daplie.com/setup/images/folder2.png similarity index 100% rename from lib/com.daplie.walnut/images/folder2.png rename to lib/walnut@daplie.com/setup/images/folder2.png diff --git a/lib/com.daplie.walnut/images/folder3.png b/lib/walnut@daplie.com/setup/images/folder3.png similarity index 100% rename from lib/com.daplie.walnut/images/folder3.png rename to lib/walnut@daplie.com/setup/images/folder3.png diff --git a/lib/com.daplie.walnut/images/folder4.png b/lib/walnut@daplie.com/setup/images/folder4.png similarity index 100% rename from lib/com.daplie.walnut/images/folder4.png rename to lib/walnut@daplie.com/setup/images/folder4.png diff --git a/lib/com.daplie.walnut/images/folder5.png b/lib/walnut@daplie.com/setup/images/folder5.png similarity index 100% rename from lib/com.daplie.walnut/images/folder5.png rename to lib/walnut@daplie.com/setup/images/folder5.png diff --git a/lib/com.daplie.walnut/images/sqrarticle.png b/lib/walnut@daplie.com/setup/images/sqrarticle.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrarticle.png rename to lib/walnut@daplie.com/setup/images/sqrarticle.png diff --git a/lib/com.daplie.walnut/images/sqrawkwardfam.png b/lib/walnut@daplie.com/setup/images/sqrawkwardfam.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrawkwardfam.png rename to lib/walnut@daplie.com/setup/images/sqrawkwardfam.png diff --git a/lib/com.daplie.walnut/images/sqrbluesteelman.png b/lib/walnut@daplie.com/setup/images/sqrbluesteelman.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrbluesteelman.png rename to lib/walnut@daplie.com/setup/images/sqrbluesteelman.png diff --git a/lib/com.daplie.walnut/images/sqrchristmaspresent.png b/lib/walnut@daplie.com/setup/images/sqrchristmaspresent.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrchristmaspresent.png rename to lib/walnut@daplie.com/setup/images/sqrchristmaspresent.png diff --git a/lib/com.daplie.walnut/images/sqrcountryroad.png b/lib/walnut@daplie.com/setup/images/sqrcountryroad.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrcountryroad.png rename to lib/walnut@daplie.com/setup/images/sqrcountryroad.png diff --git a/lib/com.daplie.walnut/images/sqrdeptstore.png b/lib/walnut@daplie.com/setup/images/sqrdeptstore.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrdeptstore.png rename to lib/walnut@daplie.com/setup/images/sqrdeptstore.png diff --git a/lib/com.daplie.walnut/images/sqrescalator.png b/lib/walnut@daplie.com/setup/images/sqrescalator.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrescalator.png rename to lib/walnut@daplie.com/setup/images/sqrescalator.png diff --git a/lib/com.daplie.walnut/images/sqrfambaby.png b/lib/walnut@daplie.com/setup/images/sqrfambaby.png similarity index 100% rename from lib/com.daplie.walnut/images/sqrfambaby.png rename to lib/walnut@daplie.com/setup/images/sqrfambaby.png diff --git a/lib/com.daplie.walnut/index.html b/lib/walnut@daplie.com/setup/index.html similarity index 100% rename from lib/com.daplie.walnut/index.html rename to lib/walnut@daplie.com/setup/index.html diff --git a/lib/com.daplie.walnut/index.js b/lib/walnut@daplie.com/setup/index.js similarity index 100% rename from lib/com.daplie.walnut/index.js rename to lib/walnut@daplie.com/setup/index.js diff --git a/lib/com.daplie.walnut/logos/Daplie-App-128px.png b/lib/walnut@daplie.com/setup/logos/Daplie-App-128px.png similarity index 100% rename from lib/com.daplie.walnut/logos/Daplie-App-128px.png rename to lib/walnut@daplie.com/setup/logos/Daplie-App-128px.png diff --git a/lib/com.daplie.walnut/logos/Daplie-App-16px.png b/lib/walnut@daplie.com/setup/logos/Daplie-App-16px.png similarity index 100% rename from lib/com.daplie.walnut/logos/Daplie-App-16px.png rename to lib/walnut@daplie.com/setup/logos/Daplie-App-16px.png diff --git a/lib/com.daplie.walnut/logos/Daplie-App-256px.png b/lib/walnut@daplie.com/setup/logos/Daplie-App-256px.png similarity index 100% rename from lib/com.daplie.walnut/logos/Daplie-App-256px.png rename to lib/walnut@daplie.com/setup/logos/Daplie-App-256px.png diff --git a/lib/com.daplie.walnut/logos/Daplie-App-32px.png b/lib/walnut@daplie.com/setup/logos/Daplie-App-32px.png similarity index 100% rename from lib/com.daplie.walnut/logos/Daplie-App-32px.png rename to lib/walnut@daplie.com/setup/logos/Daplie-App-32px.png diff --git a/lib/com.daplie.walnut/logos/dap-logo-white.png b/lib/walnut@daplie.com/setup/logos/dap-logo-white.png similarity index 100% rename from lib/com.daplie.walnut/logos/dap-logo-white.png rename to lib/walnut@daplie.com/setup/logos/dap-logo-white.png diff --git a/lib/com.daplie.walnut/logos/daplie-logo-gray.svg b/lib/walnut@daplie.com/setup/logos/daplie-logo-gray.svg similarity index 100% rename from lib/com.daplie.walnut/logos/daplie-logo-gray.svg rename to lib/walnut@daplie.com/setup/logos/daplie-logo-gray.svg diff --git a/lib/com.daplie.walnut/menu.css b/lib/walnut@daplie.com/setup/menu.css similarity index 100% rename from lib/com.daplie.walnut/menu.css rename to lib/walnut@daplie.com/setup/menu.css diff --git a/lib/com.daplie.walnut/styles.css b/lib/walnut@daplie.com/setup/styles.css similarity index 100% rename from lib/com.daplie.walnut/styles.css rename to lib/walnut@daplie.com/setup/styles.css diff --git a/lib/worker.js b/lib/worker.js index abd7922..ce7d795 100644 --- a/lib/worker.js +++ b/lib/worker.js @@ -14,9 +14,9 @@ module.exports.create = function (webserver, xconfx, state) { var sqlstores = {}; var systemFactory = require('sqlite3-cluster/client').createClientFactory({ dirname: xconfx.varpath - , prefix: 'com.daplie.walnut.' + , prefix: 'walnut+' //, dbname: 'config' - , suffix: '' + , suffix: '@daplie.com' , ext: '.sqlite3' , sock: xconfx.sqlite3Sock , ipcKey: xconfx.ipcKey