summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJavier Sánchez Parra <jsanchez@soleta.eu>2019-10-14 12:35:11 +0200
committerRamón M. Gómez <ramongomez@us.es>2019-10-14 14:15:34 +0200
commit436abc7095b6d72df74c4193b5051c2b9399b325 (patch)
treebb31fce772d72a7342390b45e7e3a781178f9781 /server
parentde36dbe3e033896de9e9438f8db8f2af9251b4af (diff)
#915 Change WebConsole to read API token from ogAdmServer.cfg
This commit changes restfunctions.php to read the API token of ogAmdServer from ogAdmRepo.cfg to ogAdmServer.cfg. This way it avoids possible communication errors if ogAdmRepo.cfg and ogAdmServer.cfg are desynced. In order to restfuntions.php can read ogAdmServer.cfg this commit also changes the permissions of the file.
Diffstat (limited to 'server')
-rwxr-xr-xserver/bin/checkperms8
1 files changed, 4 insertions, 4 deletions
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}