Merge branch 'master' of ssh://biuro.biall-net.pl:2222/plabudda/se

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -593,7 +593,7 @@ $cmd[]['rsh']='cat /etc/sudoers |grep "_www ALL = NOPASSWD: /sbin/pfctl" || echo
 
 
 //@2016-07 kopia bezpieczenstwa bazy danych mysql TODO bzyk
-$cmd[]['rsh']='mysqldump -E -R --single-transaction --triggers --allow-keywords -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' \''.$REMOTE_FOLDER_ROOT.'\' > "/var/root/'.$REMOTE_FOLDER_ROOT.'.`date \'+%Y-%m-%d\'`.mysqldump"';
+$cmd[]['rsh']='which mysqldump || exit 0 &&   echo "select 1+1;" | mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' || exit 0 &&   mysqldump -E -R --single-transaction --triggers --allow-keywords -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' \''.$REMOTE_FOLDER_ROOT.'\' > "/var/root/'.$REMOTE_FOLDER_ROOT.'.`date \'+%Y-%m-%d\'`.mysqldump  "';
 
 //ewentualna proba upgrejdowania instniejacego portu
 
@@ -1105,9 +1105,9 @@ RewriteRule (.*) /wms/mapserv.cgi?map=/Library/Server/Web/Data/Sites/Default/PLI
 RewriteBase /wms/qgis/
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule (.*) /wms/qgis/qgis_mapserv.cgi?MAP=/Library/Server/Web/Data/Sites/Default/PLIKI/WMS_LAYERS/.maps/.single/$1.qgs [QSA]" > /Library/Server/Web/Data/Sites/Default/wms/qgis/.htaccess';
- $cmd[]['rsh']='ln -s /Library/WebServer/CGI-Executables/mapserv /Library/Server/Web/Data/Sites/Default/wms/mapserv.cgi';
- $cmd[]['rsh']='ln -s /Applications/QGIS.app/Contents/MacOS/fcgi-bin/qgis_mapserv.fcgi /Library/Server/Web/Data/Sites/Default/wms/qgis/qgis_mapserv.cgi';
- $cmd[]['rsh']='mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO `CRM_CONFIG` (`CONF_KEY`,`CONF_VAL`) VALUES (\'module_WMS\',\'on\')"';
+ $cmd[]['rsh']='[ -f /Library/Server/Web/Data/Sites/Default/wms/mapserv.cgi ] || ln -s /Library/WebServer/CGI-Executables/mapserv /Library/Server/Web/Data/Sites/Default/wms/mapserv.cgi';
+ $cmd[]['rsh']='[ -f /Library/Server/Web/Data/Sites/Default/wms/qgis/qgis_mapserv.cgi ] || ln -s /Applications/QGIS.app/Contents/MacOS/fcgi-bin/qgis_mapserv.fcgi /Library/Server/Web/Data/Sites/Default/wms/qgis/qgis_mapserv.cgi';
+ $cmd[]['rsh']='mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO \\`CRM_CONFIG\\` (\\`CONF_KEY\\`,\\`CONF_VAL\\`) VALUES (\'module_WMS\',\'on\')"';
 
 return $cmd;
 
@@ -1503,7 +1503,6 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
 $cmd[]['rsh']=' php /Library/Server/Web/Data/Sites/Default/SE/bash_sync_perms.php '.$SERVER_ADDRESS.' addToLaunchctl';
 $cmd[]['rsh']=' launchctl load /Library/LaunchDaemons/pl.biallnet.sync_perms.'.$SERVER_ADDRESS.'.php.plist';
 //! #1228 @2016-04-11 bindera: jest blad - na tym etapie instalacji nie sa stworzone pliki konfiguracyjne, a ten skrypt ich wymaga, wiec jest blad!!! szukamy
-$cmd[]['rsh']='[ -e /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$SERVER_ADDRESS.'.ini.php ] || exit 0  &&  php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.php '.$SERVER_ADDRESS;
 //!@2016-04-11 jezierskik: 62.bash (bash_install_check) do podmiany, blad polega na tym, ze w nieodpowiedniej kolejnosci przechodzi proces instalacyjny co skutkuje wyskoczeniem bledu
 // nalezy zamienic kolejnosc plikow, gubi pliki konfiguracyjne
 
@@ -1531,14 +1530,22 @@ $cmd[]['rsh']=' serveradmin start mail';
 // virtual_alias_domains = $virtual_alias_maps hash:/Library/Server/Mail/Config/postfix/virtual_domains
 
 $cmd[]['rsh']=' serveradmin start calendar';
-//@2016-06 bindera: po aktualizacji sql czesto nie dziala event sheduler np zoompak
-$cmd[]['rsh']=' echo " SET GLOBAL event_scheduler =  \"ON\" " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
 
 
 return $cmd;
 }
 
+function INSTALL_GETCOMMANDS_SE_LAST_UPDATE($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) {
+ //@2016-08-10 jest blad tutaj wyzwolenia w kosmetologii z bomby ktorys error wywala 
+$cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.php '.$SERVER_ADDRESS;
+//@2016-06 bindera: po aktualizacji sql czesto nie dziala event sheduler np zoompak
+$cmd[]['rsh']=' echo " SET GLOBAL event_scheduler =  \"ON\" " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+
+	return $cmd;
+
+}
+
 
 function INSTALL_GETCOMMANDS_SE_DB_DOMAIN_UNINSTALL($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) {
 //always before install mysql (if option to use)
@@ -2473,7 +2480,7 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.MYSQL55']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_MYSQL55"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.MYSQL55']['xml_choice']['visible']='true';
 		$packages['pl.procesy5.MYSQL55']['xml_choice']['title']='Mysql-55';
-		$packages['pl.procesy5.MYSQL55']['xml_choice']['description']='Required Mysql55 database from MacPorts (it is safe no uninstall, use only first time install)';
+		$packages['pl.procesy5.MYSQL55']['xml_choice']['description']='Required Mysql55 database from MacPorts (it is safe no uninstall, use for install and update - sets power management and etc)';
 		$packages['pl.procesy5.MYSQL55']['xml_choice']['start_selected']='true';
 
 		//! pakiet: INSTALL_GETCOMMANDS_POSTGIS
@@ -2562,6 +2569,17 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['xml_choice']['start_selected']='true';
 
 
+		//! pakiet: INSTALL_GETCOMMANDS_SE_LAST_UPDATE - koncowe skrypty 
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['exit_file']=str_replace('.', '_', $h->ID.".SE_LAST_UPDATE_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['installer_dir_name']=$h->ID.".SE_LAST_UPDATE_".$h->SERVER_ADDRESS; //nazwa katalogu w jakim jest przygotowywany pkg
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['installer_tmp']="/tmp/pl.procesy5_SE_LAST_UPDATE_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_SE_LAST_UPDATE"; //miejsce do ktorego installer odpakuje wszystko instalator
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['visible']='true';
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['title']='Procesy5 last check scirpts - must run always ';
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['description']='run update scripts and bash_install_check';
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['start_selected']='true';
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['encrypt']=true;
+