From 22810e102a89f463e37b360e561ed286111af588 Mon Sep 17 00:00:00 2001 From: tomash Date: Wed, 29 Nov 2006 03:36:04 +0000 Subject: [PATCH] #2017 special scheduler account in storageServer --- .../src/modules/storageServer/etc/Makefile.in | 4 +++- .../src/modules/storageServer/etc/configure.ac | 13 +++++++++++++ .../src/modules/storageServer/var/BasicStor.php | 8 ++++++++ campcaster/src/modules/storageServer/var/conf.php | 1 + .../src/modules/storageServer/var/conf.php.template | 2 ++ .../storageServer/var/conf_only.php.template | 1 + 6 files changed, 28 insertions(+), 1 deletion(-) diff --git a/campcaster/src/modules/storageServer/etc/Makefile.in b/campcaster/src/modules/storageServer/etc/Makefile.in index 9aa306780..1ecbf7e28 100644 --- a/campcaster/src/modules/storageServer/etc/Makefile.in +++ b/campcaster/src/modules/storageServer/etc/Makefile.in @@ -92,6 +92,7 @@ DB_USER = @DB_USER@ DB_PASSWORD = @DB_PASSWORD@ SCHEDULER_PORT = @SCHEDULER_PORT@ WWW_DOCROOT = @WWW_DOCROOT@ +SCHEDULER_STORAGE_PASS = @SCHEDULER_STORAGE_PASS@ PHP_URL_PREFIX=campcaster 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_xmlRpcPrefix/${SCHEDULER_XML_RPC_PREFIX}/; \ 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}/;" #------------------------------------------------------------------------------- diff --git a/campcaster/src/modules/storageServer/etc/configure.ac b/campcaster/src/modules/storageServer/etc/configure.ac index 6b5aa3716..ea967bed6 100644 --- a/campcaster/src/modules/storageServer/etc/configure.ac +++ b/campcaster/src/modules/storageServer/etc/configure.ac @@ -186,6 +186,19 @@ AC_ARG_WITH([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 AC_MSG_NOTICE( diff --git a/campcaster/src/modules/storageServer/var/BasicStor.php b/campcaster/src/modules/storageServer/var/BasicStor.php index d6ec89d3d..f873df1d5 100644 --- a/campcaster/src/modules/storageServer/var/BasicStor.php +++ b/campcaster/src/modules/storageServer/var/BasicStor.php @@ -2516,6 +2516,7 @@ class BasicStor extends Alib { $this->rootId = $this->getRootNode(); $this->storId = $this->wd = $this->addObj('StorageRoot', 'Folder', $this->rootId); + // user root init $rootUid = parent::addSubj('root', $this->config['tmpRootPass']); $res = parent::addPerm($rootUid, '_all', $this->rootId, 'A'); if ($this->dbc->isError($res)) { @@ -2560,6 +2561,13 @@ class BasicStor extends Alib { return $stPrefGr; } $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']); } } diff --git a/campcaster/src/modules/storageServer/var/conf.php b/campcaster/src/modules/storageServer/var/conf.php index a9f661dd6..58adb1ebf 100644 --- a/campcaster/src/modules/storageServer/var/conf.php +++ b/campcaster/src/modules/storageServer/var/conf.php @@ -87,6 +87,7 @@ $config = array( 'schedulerXMLRPC' => 'RC2', 'schedulerUrlHost' => 'localhost', 'schedulerUrlPort' => 3344, + 'schedulerPass' => 'ls_scheduler_storage_pass', /* ==================================== aplication-specific configuration */ 'objtypes' => array( diff --git a/campcaster/src/modules/storageServer/var/conf.php.template b/campcaster/src/modules/storageServer/var/conf.php.template index 8f7445324..e27fcec9e 100644 --- a/campcaster/src/modules/storageServer/var/conf.php.template +++ b/campcaster/src/modules/storageServer/var/conf.php.template @@ -34,6 +34,7 @@ define('CAMPCASTER_VERSION', '1.1.0'); *
archiveAccountLogin, archiveAccountPass
account info * for login to archive *
sysSubjs
system users/groups - cannot be deleted + *
schedulerPass
scheduler's password for storageServer access * */ @@ -85,6 +86,7 @@ $config = array( 'schedulerXMLRPC' => 'ls_scheduler_xmlRpcPrefix', 'schedulerUrlHost' => 'ls_scheduler_host', 'schedulerUrlPort' => ls_scheduler_port, + 'schedulerPass' => 'ls_scheduler_storage_pass', /* ==================================== aplication-specific configuration */ 'objtypes' => array( diff --git a/campcaster/src/modules/storageServer/var/conf_only.php.template b/campcaster/src/modules/storageServer/var/conf_only.php.template index acbd211e0..07c7ff43a 100644 --- a/campcaster/src/modules/storageServer/var/conf_only.php.template +++ b/campcaster/src/modules/storageServer/var/conf_only.php.template @@ -59,6 +59,7 @@ $config = array( 'schedulerXMLRPC' => 'ls_scheduler_xmlRpcPrefix', 'schedulerUrlHost' => 'ls_scheduler_host', 'schedulerUrlPort' => ls_scheduler_port, + 'schedulerPass' => 'ls_scheduler_storage_pass', /* =================================================== cron configuration */ //'cronUserName' => 'www-data',