Updated to kth-node-configuration@1.3.1 = DOCKER READY + simplified settings

Author: jhsware

.gitignore

@@ -2,10 +2,6 @@
 
 .git/
 
-# Sass compilation related files
-public/css/*.css
-
-
 # IDEA specific
 .idea
 *.iml
@@ -31,12 +27,6 @@ logs/*
 # Dependency directory for NPM
 node_modules
 
-public/css/bootstrap
-public/css/font-awesome
-public/css/fonts
-public/css/kth-style
-public/img/kth-style
-
 # Built at startup
 bundles
 public/js/app/config*.js

Dockerfile

@@ -17,7 +17,6 @@ RUN cp -a /npm/node_modules /application && \
 
 # Copy files used by Gulp.
 COPY ["config", "config"]
-COPY ["config/secretSettings.js", "config/localSettings.js"]
 COPY ["public", "public"]
 COPY ["gulpfile.js", "gulpfile.js"]
 COPY ["package.json", "package.json"]

README.md

@@ -11,34 +11,51 @@ The two projects are [node-web](https://github.com/KTH/node-web), a web server w
 
 It's important that we try to make changes that affect the template projects in the template projects themselves.
 
+###Where do you keep you secrets?
+Secrets during local development are ALWAYS stored in a `.env`-file in the root of your project. This file should be in .gitignore. It needs to contain at least ldap connection URI and password in order for authentication to work properly:
+
+```
+LDAP_URI=ldaps://[usertname]@ldap.ref.ug.kth.se
+LDAP_PASSWORD=[password]
+```
+
+During local development the defaults in serverSettings.js should work fine. If you need to make specific changes for your machine, add these to the `.env`-file. If you want changes that should be used by anyone developing your project, change the default variables in the settings-files.
+
 ###How do I use node-web template project for a project of my own?
 1. Create a new git repository on github.com/KTH (or other somewhere else).
+
 2. Clone the newly created repository locally by using:
 
  ```bash
  git clone https://github.com/USER/REPOSITORY.git
  ```
+
 3. Navigate to the cloned project directory
+
 4. Add node-web or node-api as the upstream repository to use:
 
  ```bash
  git remote add upstream https://github.com/KTH/node-web.git
  ```
+
 5. Fetch the latest changes/branches for the upstream repository (use your KTH login if prompted):
 
  ```bash
  git fetch upstream
  ```
+
 6. Checkout the branch you want to use:
 
  ```bash
  git checkout master
  ```
+
 7. Merge the changes from node-api into your cloned repository:
 
  ```bash
  git merge upstream/master
  ```
+
 8. Solve merge conflicts and commit/push to your cloned repository.
 
 To keep your cloned repository up to date with the upstream repository, just repeat steps 5-7 from above. Make sure to commit and push your existing changes before you merge!

buildConfig.js

@@ -0,0 +1,12 @@
+/**
+ *
+ *            Browser specific settings
+ *
+ * **************************************************
+ * * WARNING! Never access any secrets in this file *
+ * **************************************************
+ *
+ */
+
+module.exports = {
+}

config/browserSettings.js

@@ -1,28 +1,19 @@
 /**
- * This configuration file is shared among all other configurations.
- * Its keys and values can be overridden in environment specific configuration files.
+ *
+ *     Common settings for server and browser
+ *
+ * **************************************************
+ * * WARNING! Never access any secrets in this file *
+ * **************************************************
+ *
  */
+const { getEnv } = require('kth-node-configuration')
+
+const devPrefixPath = '/node'
 
 module.exports = {
-  auth: {
-    adminGroup: 'app.APPNAME.admin'
-  },
-  ldapClient: {
-    version: 3,
-    searchlimit: 10,
-    searchtimeout: 10, // seconds
-    connecttimeout: 3000, // millis - 3 sec
-    timeout: 3000, // millis - 3 sec
-    maxconnections: 10, //
-    checkinterval: 10000, // millis - 10 sec
-    maxidletime: 300000, // millis - 5 min
-    scope: 'sub',
-    filterReplaceHolder: 'KTHID',
-    userattrs: [ 'displayName', 'mail', 'ugUsername', 'memberOf' ],
-    groupattrs: [ 'cn', 'objectCategory' ]
-  },
   // The proxy prefix path if the application is proxied. E.g /places
   proxyPrefixPath: {
-    uri: '/node'
+    uri: getEnv('SERVICE_PUBLISH', devPrefixPath)
   }
 }