#2017 special scheduler account in storageServer
This commit is contained in:
parent
13a06d4ba5
commit
22810e102a
|
@ -92,6 +92,7 @@ DB_USER = @DB_USER@
|
||||||
DB_PASSWORD = @DB_PASSWORD@
|
DB_PASSWORD = @DB_PASSWORD@
|
||||||
SCHEDULER_PORT = @SCHEDULER_PORT@
|
SCHEDULER_PORT = @SCHEDULER_PORT@
|
||||||
WWW_DOCROOT = @WWW_DOCROOT@
|
WWW_DOCROOT = @WWW_DOCROOT@
|
||||||
|
SCHEDULER_STORAGE_PASS = @SCHEDULER_STORAGE_PASS@
|
||||||
|
|
||||||
PHP_URL_PREFIX=campcaster
|
PHP_URL_PREFIX=campcaster
|
||||||
SCHEDULER_URL_PREFIX =
|
SCHEDULER_URL_PREFIX =
|
||||||
|
@ -113,7 +114,8 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \
|
||||||
s/ls_scheduler_urlPrefix/${SCHEDULER_URL_PREFIX}/; \
|
s/ls_scheduler_urlPrefix/${SCHEDULER_URL_PREFIX}/; \
|
||||||
s/ls_scheduler_xmlRpcPrefix/${SCHEDULER_XML_RPC_PREFIX}/; \
|
s/ls_scheduler_xmlRpcPrefix/${SCHEDULER_XML_RPC_PREFIX}/; \
|
||||||
s/ls_scheduler_host/${HOSTNAME}/; \
|
s/ls_scheduler_host/${HOSTNAME}/; \
|
||||||
s/ls_scheduler_port/${SCHEDULER_PORT}/;"
|
s/ls_scheduler_port/${SCHEDULER_PORT}/; \
|
||||||
|
s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/;"
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -186,6 +186,19 @@ AC_ARG_WITH([www-docroot],
|
||||||
AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}])
|
AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}])
|
||||||
|
|
||||||
|
|
||||||
|
dnl-----------------------------------------------------------------------------
|
||||||
|
dnl specify web document root
|
||||||
|
dnl-----------------------------------------------------------------------------
|
||||||
|
AC_SUBST(SCHEDULER_STORAGE_PASS)
|
||||||
|
|
||||||
|
AC_ARG_WITH([scheduler-storage-pass],
|
||||||
|
AC_HELP_STRING([--with-scheduler-storage-pass],
|
||||||
|
[set password for scheduler access to storage (change_me)]),
|
||||||
|
[SCHEDULER_STORAGE_PASS=${withval}], [SCHEDULER_STORAGE_PASS=change_me])
|
||||||
|
|
||||||
|
AC_MSG_RESULT([scheduler password to storage: ${SCHEDULER_STORAGE_PASS}])
|
||||||
|
|
||||||
|
|
||||||
dnl display status info on what libraries will get compiled
|
dnl display status info on what libraries will get compiled
|
||||||
|
|
||||||
AC_MSG_NOTICE(
|
AC_MSG_NOTICE(
|
||||||
|
|
|
@ -2516,6 +2516,7 @@ class BasicStor extends Alib {
|
||||||
$this->rootId = $this->getRootNode();
|
$this->rootId = $this->getRootNode();
|
||||||
$this->storId = $this->wd =
|
$this->storId = $this->wd =
|
||||||
$this->addObj('StorageRoot', 'Folder', $this->rootId);
|
$this->addObj('StorageRoot', 'Folder', $this->rootId);
|
||||||
|
// user root init
|
||||||
$rootUid = parent::addSubj('root', $this->config['tmpRootPass']);
|
$rootUid = parent::addSubj('root', $this->config['tmpRootPass']);
|
||||||
$res = parent::addPerm($rootUid, '_all', $this->rootId, 'A');
|
$res = parent::addPerm($rootUid, '_all', $this->rootId, 'A');
|
||||||
if ($this->dbc->isError($res)) {
|
if ($this->dbc->isError($res)) {
|
||||||
|
@ -2560,6 +2561,13 @@ class BasicStor extends Alib {
|
||||||
return $stPrefGr;
|
return $stPrefGr;
|
||||||
}
|
}
|
||||||
$this->addSubj2Gr('root', $this->config['StationPrefsGr']);
|
$this->addSubj2Gr('root', $this->config['StationPrefsGr']);
|
||||||
|
// user scheduler init
|
||||||
|
$schUid = parent::addSubj('scheduler', $this->config['schedulerPass']);
|
||||||
|
$res = parent::addPerm($rootUid, 'read', $this->rootId, 'A');
|
||||||
|
if ($this->dbc->isError($res)) {
|
||||||
|
return $res;
|
||||||
|
}
|
||||||
|
$r = $this->addSubj2Gr('scheduler', $this->config['AllGr']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,6 +87,7 @@ $config = array(
|
||||||
'schedulerXMLRPC' => 'RC2',
|
'schedulerXMLRPC' => 'RC2',
|
||||||
'schedulerUrlHost' => 'localhost',
|
'schedulerUrlHost' => 'localhost',
|
||||||
'schedulerUrlPort' => 3344,
|
'schedulerUrlPort' => 3344,
|
||||||
|
'schedulerPass' => 'ls_scheduler_storage_pass',
|
||||||
|
|
||||||
/* ==================================== aplication-specific configuration */
|
/* ==================================== aplication-specific configuration */
|
||||||
'objtypes' => array(
|
'objtypes' => array(
|
||||||
|
|
|
@ -34,6 +34,7 @@ define('CAMPCASTER_VERSION', '1.1.0');
|
||||||
* <dt>archiveAccountLogin, archiveAccountPass <dd>account info
|
* <dt>archiveAccountLogin, archiveAccountPass <dd>account info
|
||||||
* for login to archive
|
* for login to archive
|
||||||
* <dt>sysSubjs<dd>system users/groups - cannot be deleted
|
* <dt>sysSubjs<dd>system users/groups - cannot be deleted
|
||||||
|
* <dt>schedulerPass<dd>scheduler's password for storageServer access
|
||||||
* </dl>
|
* </dl>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -85,6 +86,7 @@ $config = array(
|
||||||
'schedulerXMLRPC' => 'ls_scheduler_xmlRpcPrefix',
|
'schedulerXMLRPC' => 'ls_scheduler_xmlRpcPrefix',
|
||||||
'schedulerUrlHost' => 'ls_scheduler_host',
|
'schedulerUrlHost' => 'ls_scheduler_host',
|
||||||
'schedulerUrlPort' => ls_scheduler_port,
|
'schedulerUrlPort' => ls_scheduler_port,
|
||||||
|
'schedulerPass' => 'ls_scheduler_storage_pass',
|
||||||
|
|
||||||
/* ==================================== aplication-specific configuration */
|
/* ==================================== aplication-specific configuration */
|
||||||
'objtypes' => array(
|
'objtypes' => array(
|
||||||
|
|
|
@ -59,6 +59,7 @@ $config = array(
|
||||||
'schedulerXMLRPC' => 'ls_scheduler_xmlRpcPrefix',
|
'schedulerXMLRPC' => 'ls_scheduler_xmlRpcPrefix',
|
||||||
'schedulerUrlHost' => 'ls_scheduler_host',
|
'schedulerUrlHost' => 'ls_scheduler_host',
|
||||||
'schedulerUrlPort' => ls_scheduler_port,
|
'schedulerUrlPort' => ls_scheduler_port,
|
||||||
|
'schedulerPass' => 'ls_scheduler_storage_pass',
|
||||||
|
|
||||||
/* =================================================== cron configuration */
|
/* =================================================== cron configuration */
|
||||||
//'cronUserName' => 'www-data',
|
//'cronUserName' => 'www-data',
|
||||||
|
|
Loading…
Reference in New Issue