Просмотр исходного кода

todo test api call to addUser + myqdmin update to newer in garbage

a.binder 8 лет назад
Родитель
Сommit
0cf31018c4
1 измененных файлов с 12 добавлено и 7 удалено
  1. 12 7
      SE/superedit-INSTALL_SES_PROCESY_A.php

+ 12 - 7
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -2077,11 +2077,11 @@ database=\"SES_USERS2\"
 // TODO $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncGroup.php '.$SERVER_ADDRESS.' 3';
 
 
-// $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
-// $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+ $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+ $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 																												//addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME,             $ADM_ADMIN_DESC,											 $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP )
 
- $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_AddUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1.' 3  0              0               '.$ADMIN_USERNAME_L1.' Podstawowe_konto_uzytkownika_z_licencji_instalatora_systemu  Pracownik  '.$ADMIN_USERNAME_L1_PASS.' 3  3 ' ;
+// $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_AddUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1.' 3  0              0               '.$ADMIN_USERNAME_L1.' Podstawowe_konto_uzytkownika_z_licencji_instalatora_systemu  Pracownik  '.$ADMIN_USERNAME_L1_PASS.' 3  3 ' ;
  
  $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_DIRECTORY.'\',\'0\',\''.$ADMIN_USERNAME_PASSWD.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
@@ -2185,17 +2185,22 @@ return $cmd;
 
 function INSTALL_GETCOMMANDS_MYADMIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
  $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz || echo PASSED';
+ $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages.tar.gz  && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages.tar.gz  || echo PASSED';
+ $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz || echo PASSED';
+
+
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages || echo PASSED';
+ $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages || echo PASSED';
+
 
- $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz || echo PASSED';
 
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/garbage && rm -R /Library/Server/Web/Data/Sites/Default/garbage || echo PASSED';
 //! phpMyAdmin garbage
- $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/phpMyAdmin-4.4.11-all-languages.tar.gz','/Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz');
+ $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/phpMyAdmin-4.7.4-all-languages.tar.gz','/Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.7.4-all-languages.tar.gz');
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/ || exit 1
-  tar -zxpvf phpMyAdmin-4.4.11-all-languages.tar.gz || exit 1';
+  tar -zxpvf phpMyAdmin-4.7.4-all-languages.tar.gz || exit 1';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/ || exit 1
- mv phpMyAdmin-4.4.11-all-languages garbage || exit 1 ';
+ mv phpMyAdmin-4.7.4-all-languages garbage || exit 1 ';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/garbage || exit 1
 echo "<?
 \\$cfg[\'PmaAbsoluteUri\'] = \'https://'.$SERVER_ADDRESS.'/garbage/\';