Ignore:
Timestamp:
03/15/14 01:00:23 (11 years ago)
Author:
hendrikvanantwerpen
Message:
  • Support different environments with QED_ENV. If dev, run against qed-dev database, if production, run against qed database. The UI indicates if we are running in anything but production mode.
  • Return undefined if we allow page leaves, because null is treated as a value.
  • Changed format of design docs, so it can work for different databases.
  • Use correct design documents in configCouch, so server now actually updates them when it starts.
Location:
Dev/trunk/src/server/config
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Dev/trunk/src/server/config/config-couchdb.js

    r487 r519  
    2020        }
    2121    }).then(function(res){
    22         console.log("Checking database 'qed'");
    23         return server.get('qed')
     22        console.log("Checking database '"+dbName+"'");
     23        return server.get(dbName)
    2424        .then(function(db){
    25             console.log("Database 'qed' found.");
     25            console.log("Database found.");
    2626        },function(err){
    27             console.log("Creating database 'qed'");
    28             return server.put('qed');
     27            console.log("Creating database.");
     28            return server.put(dbName);
    2929        });
    3030    }).then(function(){
    … …  
    3434                var configAction = doc.__configAction || "replace";
    3535                delete doc.__configAction;
     36                docUrl = dbName+'/'+docUrl;
    3637                switch (configAction) {
    3738                case "ignore":

  • Dev/trunk/src/server/config/couchdb-design-docs.js

    r516 r519  
    11module.exports = {
    22
    3     "_users/qed_admin": {
    4         __configAction: "ignore",
    5         _id: "org.couchdb.user:qed_admin",
    6         name: "qed_admin",
    7         password: "Welkom01",
    8         roles: [ "qed_admin" ],
    9         type: "user"
    10     },
    11 
    12     "qed/schemaInfo": {
     3    "schemaInfo": {
     4        _id: "schemaInfo",
    135        version: "4"
    146    },
    157
    16     "qed/_security": {
    17         __configAction: "ignore",
    18         admins: {
    19             names: [],
    20             roles: ["qed_admin"]
    21         },
    22         readers: {
    23             names: [],
    24             roles: ["qed_user"]
    25         }
    26     },
    27 
    28     "qed/_design/protectPublished": {
     8    "_design/protectPublished": {
    299        __configAction: "replace",
    30         _id: "_design/protectPublished",
    3110        language: "javascript",
    3211        validate_doc_update: function(newDoc, oldDoc, userCtx, secObj) {
    … …  
    3716    },
    3817
    39     "qed/_design/default": {
     18    "_design/default": {
    4019        __configAction: "replace",
    41         _id: "_design/default",
    4220        language: "javascript",
    4321        views: {
    … …  
    5735    },
    5836
    59     "qed/_design/questions": {
     37    "_design/questions": {
    6038        __configAction: "replace",
    61         _id: "_design/questions",
    6239        language: "javascript",
    6340        views: {
    … …  
    11794    },
    11895
    119     "qed/_design/surveys": {
     96    "_design/surveys": {
    12097        __configAction: "replace",
    121         _id: "_design/surveys",
    12298        language: "javascript",
    12399        views: {
    … …  
    137113    },
    138114
    139     "qed/_design/surveyRuns": {
     115    "_design/surveyRuns": {
    140116        __configAction: "replace",
    141         _id: "_design/surveys",
    142117        language: "javascript",
    143118        views: {
    … …  
    153128    },
    154129
    155     "qed/_design/responses": {
     130    "_design/responses": {
    156131        __configAction: "replace",
    157         _id: "_design/responses",
    158132        language: "javascript",
    159133        views: {

  • Dev/trunk/src/server/config/couchdb-upgrade-design-docs.js

    r516 r519  
    11module.exports = {
    22
    3     "qed/schemaInfo": {
     3    "schemaInfo": {
    44        version: "-1"
    55    },
    66
    7     "qed/_design/protectPublished": {
    8         __configAction: "replace",
    9         _id: "_design/protectPublished"
     7    "_design/protectPublished": {
     8        __configAction: "replace"
    109    }
    1110
Note: See TracChangeset for help on using the changeset viewer.