Permalink
Browse files

Fix config file extension on read.me and in other files

  • Loading branch information...
leandrozacarias committed Jan 18, 2017
1 parent 6d480e9 commit f8e7f5965c0f50d5b2ad0edd8333d6189a046e90
View
@@ -21,7 +21,7 @@ plugins/*
!plugins/wp_import/**
**/node_modules
**/node_modules/**
config.json
config.js
**/.DS_Store
**/dump.rdb
View
@@ -40,7 +40,7 @@ The instructions below assume that Node.js [0.11, 6] and MongoDB [2, 3) are inst
2. ```cd``` into the cloned repository's folder
3. Run ```npm install``` to retrieve PencilBlue's dependencies. Depending on your system access privileges, you may have to run ```sudo npm install```
4. (Optional) Install [Redis](http://redis.io/) for caching
5. (Optional) Create a custom configuration file using the provided ```sample.config.json```. The file can reside in two places: within the root folder of your installation as ```config.json``` or at ```/etc/pencilblue/config.json```. The installation root takes precedence. If running all services locally, no configuration file is needed, but a configuration file is necessary for overriding specific settings.
5. (Optional) Create a custom configuration file using the provided ```sample.config.js```. The file can reside in two places: within the root folder of your installation as ```config.js``` or at ```/etc/pencilblue/config.js```. The installation root takes precedence. If running all services locally, no configuration file is needed, but a configuration file is necessary for overriding specific settings.
6. Start PencilBlue. You can simply run ```node pencilblue```, but we recommend using [nodemon](https://www.npmjs.org/package/nodemon) for development and [forever](https://www.npmjs.org/package/forever) for production. Nodemon will restart PencilBlue on file changes and forever will ensure that PencilBlue is always running.
```
# development
View
@@ -25,10 +25,10 @@ var winston = require('winston');
/**
* Default configuration. The settings here should be overriden by taking the
* example file "sample.config.json" and modifying it to override the properties
* example file "sample.config.js" and modifying it to override the properties
* shown below. In order to properly override the default configuration do the
* following:
* 1) copy "sample.config.json" to "/etc/pencilblue/config.json"
* 1) copy "sample.config.js" to "/etc/pencilblue/config.js"
* 2) Override the properties as desired.
* 3) Add any custom properties you wish to provide for your specific purposes.
* @class Configuration
@@ -174,7 +174,7 @@ Configuration.getBaseConfig = function(multisite) {
skip_index_check: false,
//The indices that will be ensured by the system. This list is checked
//at startup by every child process. The override config.json file may
//at startup by every child process. The override config.js file may
//also provide this attribute. In that case the items in that array
//will be added to the those that already exist. This attributes is generated
//based on the multisite boolean setting. NOTE: duplicates can
@@ -57,7 +57,7 @@ module.exports = function(pb) {
dbName: pb.config.db.name,
dbServers: pb.config.db.servers,
callHome: callHome,
configSet: fs.existsSync(pb.config.docRoot + '/config.json')
configSet: fs.existsSync(pb.config.docRoot + '/config.js')
};
var angularObjects = pb.ClientJs.getAngularObjects({
@@ -459,7 +459,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Konfiguration',
EDIT_CONFIGURATION: 'Um die Konfiguration zu bearbeiten, müssen die die Datei "config.json" im Root-Verzeichnis anlegen.',
EDIT_CONFIGURATION: 'Um die Konfiguration zu bearbeiten, müssen die die Datei "config.js" im Root-Verzeichnis anlegen.',
MEDIA_ROOT: 'Root-Verzeichnis der Medientyp',
SITE_NAME: 'Name der Seite',
SITE_ROOT: 'Root-Verzeichnis der Seite',
@@ -475,7 +475,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Configuration',
EDIT_CONFIGURATION: 'To edit the configuration, create a config.json file in the root directory',
EDIT_CONFIGURATION: 'To edit the configuration, create a config.js file in the root directory',
SITE_NAME: 'Site name',
SITE_ROOT: 'Site root',
MEDIA_ROOT: 'Media root',
@@ -435,7 +435,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Configuración',
EDIT_CONFIGURATION: 'Para cambiar la configuración, crea un archivo config.json en el directorio raíz.',
EDIT_CONFIGURATION: 'Para cambiar la configuración, crea un archivo config.js en el directorio raíz.',
SITE_NAME: 'Nombre del sitio',
SITE_ROOT: 'Raíz del sitio',
MEDIA_ROOT: 'Raíz del multimedia',
@@ -434,7 +434,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Configuration',
EDIT_CONFIGURATION: 'To edit the configuration, create a config.json file in the root directory',
EDIT_CONFIGURATION: 'To edit the configuration, create a config.js file in the root directory',
SITE_NAME: 'Site name',
SITE_ROOT: 'Site root',
DOCUMENT_ROOT: 'Document root',
@@ -434,7 +434,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Configuration',
EDIT_CONFIGURATION: 'Pour éditer la configuration, créer un fichier config.json dans le répertoire racine',
EDIT_CONFIGURATION: 'Pour éditer la configuration, créer un fichier config.js dans le répertoire racine',
SITE_NAME: 'Nom du site',
SITE_ROOT: 'Racine du site',
MEDIA_ROOT: 'Racine du média',
@@ -22,7 +22,7 @@ module.exports = {
WRITER: 'Schrijver',
READER: 'Lezer',
EDITOR: 'Bewerker',
MANAGING_EDITOR: 'Beherend bewerker',
MANAGING_EDITOR: 'Beherend bewerker',
ADMINISTRATOR: 'Administrator',
COLUMN_INCHES: 'Kolom breedte (inches)',
CONTENT: 'Inhoud',
@@ -72,7 +72,7 @@ module.exports = {
RESET_SETTINGS: 'Reset instellingen',
UNINSTALL: 'Deinstalleer',
INSTALL: 'Installeer',
ACTIVE_PLUGIN_DESCRIPTION: 'Plugins die reeds geïnstalleerd zijn en werken tijdens de opstart van het systeem.',
ACTIVE_PLUGIN_DESCRIPTION: 'Plugins die reeds geïnstalleerd zijn en werken tijdens de opstart van het systeem.',
INACTIVE_PLUGIN_DESCRIPTION: 'Plugins die reeds geïnstalleerd zijn of deels geïnstalleerd zijn, maar niet correct opstarten.',
AVAILABLE_PLUGIN_DESCRIPTION: 'Plugins die beschikbaar zijn, gedownload zijn en klaar zijn om geïnstalleerd te worden.',
PLEASE_WAIT: 'Gelieve te wachten',
@@ -434,7 +434,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Configuratie',
EDIT_CONFIGURATION: 'Om de configuratie aan te passen, creëer een config.json file in de hoofdmap (root)',
EDIT_CONFIGURATION: 'Om de configuratie aan te passen, creëer een config.js file in de hoofdmap (root)',
SITE_NAME: 'Site naam',
SITE_ROOT: 'Site root',
DOCUMENT_ROOT: 'Document root',
@@ -436,7 +436,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Konfiguracja',
EDIT_CONFIGURATION: 'Aby zedytować ustawienia stwórz plik config.json w katalogu głównym',
EDIT_CONFIGURATION: 'Aby zedytować ustawienia stwórz plik config.js w katalogu głównym',
SITE_NAME: 'Nazwa strony',
SITE_ROOT: 'Katalog główny strony',
MEDIA_ROOT: 'Korzeń mediów',
@@ -434,7 +434,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Configuração',
EDIT_CONFIGURATION: 'Para editar as configurações, crie um config.json na raiz do diretório',
EDIT_CONFIGURATION: 'Para editar as configurações, crie um config.js na raiz do diretório',
SITE_NAME: 'Nome do site',
SITE_ROOT: 'Raiz do site',
MEDIA_ROOT: 'Raiz do mídia',
@@ -429,7 +429,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: 'Configurare',
EDIT_CONFIGURATION: 'Pentru a edita configurarea creaza un fisier config.json in folderul radacina',
EDIT_CONFIGURATION: 'Pentru a edita configurarea creaza un fisier config.js in folderul radacina',
SITE_NAME: 'Nume sit',
SITE_ROOT: 'Radacina sit',
MEDIA_ROOT: 'Radacina media',
@@ -1,6 +1,6 @@
module.exports = {
generic: {
LOCALE_DISPLAY: 'Русский (РФ)',
LOCALE_DISPLAY: 'Русский (РФ)',
PENCILBLUE: 'PencilBlue',
ALL_RIGHTS: 'Все права защищены',
NONE: 'Нет',
@@ -450,7 +450,7 @@ module.exports = {
site_settings:
{
CONFIGURATION: 'Настройки сайта',
EDIT_CONFIGURATION: 'Чтобы изменить/настроить конфигурацию, создайте файл config.json в корневом каталоге',
EDIT_CONFIGURATION: 'Чтобы изменить/настроить конфигурацию, создайте файл config.js в корневом каталоге',
SITE_NAME: 'Название сайта',
SITE_ROOT: 'URL сайта',
DOCUMENT_ROOT: 'Корневой каталог',
@@ -434,7 +434,7 @@ module.exports = {
},
site_settings: {
CONFIGURATION: '配置',
EDIT_CONFIGURATION: '要修改配置, 需要在根目录创建一个 config.json 文件',
EDIT_CONFIGURATION: '要修改配置, 需要在根目录创建一个 config.js 文件',
SITE_NAME: '站点名称',
SITE_ROOT: '站点地址',
DOCUMENT_ROOT: '文件地址',
View
@@ -6,7 +6,7 @@
*
* The file can be renamed to "config.js" in the same directory as this file
* and it will be used as the configuration when PencilBlue is started. If
* this file is used then there is no need to create a "config.json"
* this file is used then there is no need to create a "config.js"
*/
module.exports = {

0 comments on commit f8e7f59

Please sign in to comment.