Skip to content

Commit

Permalink
Merge pull request #23 from Lapinskas/develop
Browse files Browse the repository at this point in the history
Usage of config file created by Ubiquity
  • Loading branch information
Lapinskas authored Mar 6, 2020
2 parents c0f54c5 + 90be6a6 commit 50a59d9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# Changelog
## [1.0.8] - 2020-02-29

### Fixed

- Configuration is now compatible with Uniquity devtools. Thanks to @wizzybenson

## [1.0.7] - 2020-02-29

### Added
Expand Down Expand Up @@ -29,7 +35,7 @@

- First stable release


[1.0.8]: https://github.com/Lapinskas/roadrunner-ubiquity/releases/tag/1.0.8
[1.0.7]: https://github.com/Lapinskas/roadrunner-ubiquity/releases/tag/1.0.7
[1.0.6]: https://github.com/Lapinskas/roadrunner-ubiquity/releases/tag/1.0.6
[1.0.4]: https://github.com/Lapinskas/roadrunner-ubiquity/releases/tag/1.0.4
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "lapinskas/roadrunner-ubiquity",
"type": "library",
"version": "1.0.7",
"version": "1.0.8",
"description": "RoadRunner and Ubiquity integration",
"keywords": ["roadrunner","ubiquity"],
"homepage": "https://github.com/Lapinskas/roadrunner-ubiquity",
Expand Down
4 changes: 3 additions & 1 deletion sample/rr-worker.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
ini_set('max_execution_time', 0);

$config=include_once ROOT . 'config/config.php';
$config['siteUrl'] = 'http://127.0.0.1:8090/';
$sConfig= include __DIR__.\DS.'config.php';
$config ["siteUrl"] = 'http://'.$sConfig['host'].':'.$sConfig['port'].'/';
$config ['sessionName'] = $sConfig['sessionName'];

require_once ROOT.'../vendor/autoload.php';
require_once ROOT.'config/services.php';
Expand Down

0 comments on commit 50a59d9

Please sign in to comment.