diff options
| -rw-r--r-- | admin/WebConsole/includes/restfunctions.php | 4 | ||||
| -rwxr-xr-x | server/bin/checkperms | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/admin/WebConsole/includes/restfunctions.php b/admin/WebConsole/includes/restfunctions.php index d27fdad0..fe331153 100644 --- a/admin/WebConsole/includes/restfunctions.php +++ b/admin/WebConsole/includes/restfunctions.php @@ -61,8 +61,8 @@ define('OG_REST_PARAM_DIFF_ID', 'diff_id'); define('OG_REST_PARAM_DIFF_NAME', 'diff_name'); define('OG_REST_PARAM_METHOD', 'method'); -$conf_file = parse_ini_file(__DIR__ . '/../../etc/ogAdmRepo.cfg'); -define('OG_REST_API_TOKEN', 'Authorization: ' . $conf_file['ApiToken']); +$conf_file = parse_ini_file(__DIR__ . '/../../etc/ogAdmServer.cfg'); +define('OG_REST_API_TOKEN', 'Authorization: ' . $conf_file['APITOKEN']); function common_request($command, $type, $data = null) { diff --git a/server/bin/checkperms b/server/bin/checkperms index 3f79e2d3..b7559e84 100755 --- a/server/bin/checkperms +++ b/server/bin/checkperms @@ -48,10 +48,10 @@ chown -R $OPENGNSYS_USER:$OPENGNSYS_USER $OPENGNSYS_DIR/client/etc/ssl/private chmod -R go-rwx $OPENGNSYS_DIR/client/etc/ssl/private chown $OPENGNSYS_USER:$OPENGNSYS_USER $OPENGNSYS_DIR/client/interfaceAdm/CambiarAcceso chmod 700 $OPENGNSYS_DIR/client/interfaceAdm/CambiarAcceso -chown root:root $OPENGNSYS_DIR/etc/{ogAdmServer,ogAdmAgent}*.cfg -chmod 600 $OPENGNSYS_DIR/etc/{ogAdmServer,ogAdmAgent}*.cfg -chown root:$APACHE_GROUP $OPENGNSYS_DIR/{www/controlacceso*.php,etc/ogAdmRepo*.cfg} -chmod 640 $OPENGNSYS_DIR/{www/controlacceso*.php,etc/ogAdmRepo*.cfg} +chown root:root $OPENGNSYS_DIR/etc/ogAdmAgent*.cfg +chmod 600 $OPENGNSYS_DIR/etc/ogAdmAgent*.cfg +chown root:$APACHE_GROUP $OPENGNSYS_DIR/{www/controlacceso*.php,etc/ogAdmRepo*.cfg,etc/ogAdmServer*.cfg} +chmod 640 $OPENGNSYS_DIR/{www/controlacceso*.php,etc/ogAdmRepo*.cfg,etc/ogAdmServer*.cfg} chown -R $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/www/images/{fotos,iconos} mkdir -p $OPENGNSYS_DIR/www/{api,tmp} chown -R $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/www/{api,tmp} |