Update to use new YAML config files

Islandora · Apr 18, 2017 · c1d362e · c1d362e
1 parent 4b55843
commit c1d362e
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 147 deletions.
diff --git a/Gemini/README.md b/Gemini/README.md
@@ -28,7 +28,7 @@ CREATE TABLE gemini.Gemini (
 
 ## Configuration
 
-Gemini accepts [configuration for Doctrine's DBAL](http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html) as the `db.options` array in [its config file](./cfg/cfg.php) file.  Reasonable defaults provided are for a MySQL installation.  Do not commit the configuration file with your credentials into Git!
+Gemini accepts [configuration for Doctrine's DBAL](http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html) as the `db.options` array in [its config file](./cfg/config.yaml) file.  Reasonable defaults provided are for a MySQL installation.  Do not commit the configuration file with your credentials into Git!
 
 ## Usage
 

diff --git a/Gemini/cfg/cfg.php b/Gemini/cfg/cfg.php
diff --git a/Gemini/cfg/config.yaml b/Gemini/cfg/config.yaml
@@ -0,0 +1,24 @@
+---
+
+db.options:
+  driver: pdo_mysql
+  host: 127.0.0.1
+  port: 3306
+  dbname: gemini
+  user: changeme
+  password: changeme
+
+log:
+  # Valid log levels are:
+  # DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY, NONE
+  # log level none won't open logfile
+  level: DEBUG
+  file: ../gemini.log
+
+security:
+  # toggles JWT security for service
+  enable: false
+  # Path to the syn config file for authentication.
+  # example can be found here:
+  # https://github.com/Islandora-CLAW/Syn/blob/master/conf/syn-settings.example.xml
+  config: ../syn-settings.xml
diff --git a/Gemini/src/app.php b/Gemini/src/app.php
@@ -2,17 +2,18 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-use Islandora\Crayfish\Commons\IslandoraServiceProvider;
+use Islandora\Crayfish\Commons\Provider\IslandoraServiceProvider;
 use Islandora\Crayfish\Commons\PathMapper\PathMapper;
+use Islandora\Crayfish\Commons\Provider\YamlConfigServiceProvider;
 use Islandora\Gemini\Controller\GeminiController;
 use Silex\Application;
 
-$config = require_once(__DIR__ . '/../cfg/cfg.php');
-
 $app = new Application();
-$app->register(new IslandoraServiceProvider($config));
 
-$app['gemini.controller'] = function () use ($app) {
+$app->register(new IslandoraServiceProvider());
+$app->register(new YamlConfigServiceProvider('../cfg/config.yaml'));
+
+$app['gemini.controller'] = function ($app) {
     return new GeminiController(
         new PathMapper($app['db'])
     );

diff --git a/Houdini/README.md b/Houdini/README.md
@@ -16,7 +16,7 @@
 
 ## Configuration
 
-If your imagemagick installation is not on your path, then you can configure Houdini to use a specific executable by editing `executable` entry in [cfg.php](./cfg/cfg.php).
+If your imagemagick installation is not on your path, then you can configure Houdini to use a specific executable by editing `executable` entry in [config.yaml](./cfg/config.yaml).
 
 You also will need to set the `fedora base url` entry to point to your Fedora installation.
 

diff --git a/Houdini/cfg/cfg.php b/Houdini/cfg/cfg.php
diff --git a/Houdini/cfg/config.yaml b/Houdini/cfg/config.yaml
@@ -0,0 +1,30 @@
+---
+
+fedora:
+  base_url: http://localhost:8080/fcrepo/rest
+
+log:
+  # Valid log levels are:
+  # DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY, NONE
+  # log level none won't open logfile
+  level: DEBUG
+  file: ../houdini.log
+
+houdini:
+  # path to the convert executable
+  executable: convert
+  formats:
+    valid:
+      - image/jpeg
+      - image/png
+      - image/tiff
+      - image/jp2
+    default: image/jpeg
+
+security:
+  # toggles JWT security for service
+  enable: false
+  # Path to the syn config file for authentication.
+  # example can be found here:
+  # https://github.com/Islandora-CLAW/Syn/blob/master/conf/syn-settings.example.xml
+  config: ../syn-settings.xml
diff --git a/Houdini/composer.json b/Houdini/composer.json
@@ -40,4 +40,11 @@
         "squizlabs/php_codesniffer": "^2.0",
         "sebastian/phpcpd": "^3.0"
     }
+    ,
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../../Crayfish-Commons"
+        }
+    ]
 }
diff --git a/Houdini/src/app.php b/Houdini/src/app.php
@@ -2,20 +2,22 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-use Islandora\Crayfish\Commons\IslandoraServiceProvider;
+use Islandora\Crayfish\Commons\Provider\IslandoraServiceProvider;
+use Islandora\Crayfish\Commons\Provider\YamlConfigServiceProvider;
 use Islandora\Houdini\Controller\HoudiniController;
 use Silex\Application;
 
-$config = require_once(__DIR__ . '/../cfg/cfg.php');
 $app = new Application();
-$app->register(new IslandoraServiceProvider($config));
 
-$app['houdini.controller'] = function ($app) use ($config) {
+$app->register(new IslandoraServiceProvider());
+$app->register(new YamlConfigServiceProvider('../cfg/config.yaml'));
+
+$app['houdini.controller'] = function ($app) {
     return new HoudiniController(
         $app['crayfish.cmd_execute_service'],
-        $config['valid formats'],
-        $config['default format'],
-        $config['executable'],
+        $app['crayfish.houdini.formats.valid'],
+        $app['crayfish.houdini.formats.default'],
+        $app['crayfish.houdini.executable'],
         $app['monolog']
     );
 };

diff --git a/Hypercube/.github/PULL_REQUEST_TEMPLATE.md b/Hypercube/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/Hypercube/README.md b/Hypercube/README.md
@@ -37,7 +37,7 @@ This will put the Hypercube at the /hypercube endpoint on the webserver.
 
 ## Configuration
 
-If your tesseract installation is not on your path, then you can configure Hypercube to use a specific executable by editing `executable` entry in [cfg.php](./cfg/cfg.php).
+If your tesseract installation is not on your path, then you can configure Hypercube to use a specific executable by editing `executable` entry in [config.yaml](./cfg/config.yaml).
 
 You also will need to set the `fedora base url` entry to point to your Fedora installation.
 

diff --git a/Hypercube/cfg/cfg.php b/Hypercube/cfg/cfg.php
diff --git a/Hypercube/cfg/config.yaml b/Hypercube/cfg/config.yaml
@@ -0,0 +1,23 @@
+---
+
+fedora:
+  base_url: http://localhost:8080/fcrepo/rest
+
+log:
+  # Valid log levels are:
+  # DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY, NONE
+  # log level none won't open logfile
+  level: DEBUG
+  file: ../hypercube.log
+
+hypercube:
+  # path to the convert executable
+  executable: tesseract
+
+security:
+  # toggles JWT security for service
+  enable: false
+  # Path to the syn config file for authentication.
+  # example can be found here:
+  # https://github.com/Islandora-CLAW/Syn/blob/master/conf/syn-settings.example.xml
+  config: ../syn-settings.xml
diff --git a/Hypercube/src/app.php b/Hypercube/src/app.php
@@ -2,18 +2,19 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-use Islandora\Crayfish\Commons\IslandoraServiceProvider;
+use Islandora\Crayfish\Commons\Provider\IslandoraServiceProvider;
+use Islandora\Crayfish\Commons\Provider\YamlConfigServiceProvider;
 use Islandora\Hypercube\Controller\HypercubeController;
 use Silex\Application;
 
-$config = require_once(__DIR__ . '/../cfg/cfg.php');
 $app = new Application();
-$app->register(new IslandoraServiceProvider($config));
+$app->register(new IslandoraServiceProvider());
+$app->register(new YamlConfigServiceProvider('../cfg/config.yaml'));
 
-$app['hypercube.controller'] = function () use ($app, $config) {
+$app['hypercube.controller'] = function ($app) {
     return new HypercubeController(
         $app['crayfish.cmd_execute_service'],
-        $config['executable']
+        $app['crayfish.hypercube.executable']
     );
 };