Kaynağa Gözat

added generate config files content by Config in instalator

Piotr Labudda 8 yıl önce
ebeveyn
işleme
b5fad49439
1 değiştirilmiş dosya ile 33 ekleme ve 43 silme
  1. 33 43
      SE/superedit-INSTALL_SES_PROCESY_A.php

+ 33 - 43
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -750,7 +750,7 @@ $cmd[]['rsh']='serveradmin stop web && serveradmin start web';
   //@2018-01 brakujaca commons-net-3.6.jar w /opt/local/share/java/apache-ant/lib/ do tasku <antstructure out=".dtd">
   //@2018-01 brakujaca commons-net-3.6.jar w /opt/local/share/java/apache-ant/lib/ do tasku <antstructure out=".dtd">
    $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/commons-net-3.6.jar','/opt/local/share/java/apache-ant/lib/commons-net-3.6.jar');
    $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/commons-net-3.6.jar','/opt/local/share/java/apache-ant/lib/commons-net-3.6.jar');
    $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/ant/dtd2xsd.pl','/opt/local/bin/dtd2xsd.pl');
    $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/ant/dtd2xsd.pl','/opt/local/bin/dtd2xsd.pl');
- 
+
 
 
  return $cmd;
  return $cmd;
 
 
@@ -1181,7 +1181,7 @@ function INSTALL_GETCOMMANDS_NODEJS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_US
  $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v8.9.3.pkg','/tmp/node-v8.9.3.pkg');
  $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v8.9.3.pkg','/tmp/node-v8.9.3.pkg');
 
 
  $cmd[]['rsh']='installer -package "/tmp/stuff/node-v8.9.3.pkg" -target "/" -verbose';
  $cmd[]['rsh']='installer -package "/tmp/stuff/node-v8.9.3.pkg" -target "/" -verbose';
- 
+
  $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v6.3.1-darwin-x64.tar','/tmp/node-v6.3.1-darwin-x64.tar');
  $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v6.3.1-darwin-x64.tar','/tmp/node-v6.3.1-darwin-x64.tar');
  $cmd[]['rsh']='cd /tmp && tar xvfz node-v6.3.1-darwin-x64.tar';
  $cmd[]['rsh']='cd /tmp && tar xvfz node-v6.3.1-darwin-x64.tar';
  $cmd[]['rsh']='mkdir -p /usr/local/nodejs';
  $cmd[]['rsh']='mkdir -p /usr/local/nodejs';
@@ -1728,20 +1728,15 @@ function INSTALL_GETCOMMANDS_SE_DB_DOMAIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$AD
   //! .cnf--default_db
   //! .cnf--default_db
     $cmd[]['rsh']=' [ -d /Library/Server/Web/Data/Sites/Default/SE ] && echo PASSED '; //zalozenie katalogow
     $cmd[]['rsh']=' [ -d /Library/Server/Web/Data/Sites/Default/SE ] && echo PASSED '; //zalozenie katalogow
 
 
-
-  $cmd[]['rsh']=' echo ";<?php
-;die(); // For further security
-;// default DB
-
-type=\"mysql\"
-host=\"127.0.0.1\"
-port=\"3306\"
-user=\"root\"
-pass=\"'.$ADMIN_USERNAME_PASSWD.'\"
-database=\"'.$REMOTE_FOLDER_ROOT.'\"
-zasob_id=\"2\"
-
-" > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$SERVER_ADDRESS.'.ini.php
+	$cmd[]['rsh'] = ' echo "' . V::quoteBashEcho(
+		Config::generateDefaultDbConfigFile(
+			[
+				'database' => $REMOTE_FOLDER_ROOT,
+				'password' => $ADMIN_USERNAME_PASSWD,
+			],
+			$outputFormat = 'ini'
+		)
+	) .  '" > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-' . $SERVER_ADDRESS . '.ini.php
 ';
 ';
 
 
  //! .cnf--folders
  //! .cnf--folders
@@ -2058,17 +2053,16 @@ DEST_FOLDER_VARNAME1=\"ID\"
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php';
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php';
 //! .config_domena_.php
 //! .config_domena_.php
 //LDAP
 //LDAP
-$cmd[]['rsh']='echo ";<?php
-;die(); // For further security
-;// default LDAP
-
-version=\"3\"
-host=\"127.0.0.1\"
-;//port=\"\"
-user=\"'.$ADMIN_USERNAME_DIRECTORY.'\"
-pass=\"'.$ADMIN_USERNAME_PASSWD.'\"
-base_dn=\"'.$SERVER_ADDRESS_LDAP_DC.'\"
-" > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$SERVER_ADDRESS.'.ini.php
+$cmd[]['rsh'] = ' echo "' . V::quoteBashEcho(
+	Config::generateDefaultLdapConfigFile(
+		[
+			'user' => $ADMIN_USERNAME_DIRECTORY,
+			'pass' => $ADMIN_USERNAME_PASSWD,
+			'base_dn' => $SERVER_ADDRESS_LDAP_DC,
+		],
+		$outputFormat = 'ini'
+	)
+) .  '" > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-' . $SERVER_ADDRESS . '.ini.php
 ';
 ';
 
 
 $cmd[]['rsh']='echo "<?php
 $cmd[]['rsh']='echo "<?php
@@ -2196,20 +2190,16 @@ $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TAB
 //[4803]=vpn.biall-net.pl -> todo(adres IP lokalny w ramach vpn.$SERVER_ADDRESS)
 //[4803]=vpn.biall-net.pl -> todo(adres IP lokalny w ramach vpn.$SERVER_ADDRESS)
 
 
  //! .cnf--default_db as id 2
  //! .cnf--default_db as id 2
-  $cmd[]['rsh']=' echo ";<?php
-;die(); // For further security
-;// default DB
-
-type=\"mysql\"
-host=\"127.0.0.1\"
-port=\"3306\"
-user=\"root\"
-pass=\"'.$ADMIN_USERNAME_PASSWD.'\"
-database=\"'.$REMOTE_FOLDER_ROOT.'\"
-zasob_id=\"2\"
-
-" > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$SERVER_ADDRESS.'.ini.php
-';
+	$cmd[]['rsh'] = ' echo "' . V::quoteBashEcho(
+		Config::generateDefaultDbConfigFile(
+			[
+				'database' => $REMOTE_FOLDER_ROOT,
+				'password' => $ADMIN_USERNAME_PASSWD,
+			],
+			$outputFormat = 'ini'
+		)
+	) .  '" > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-' . $SERVER_ADDRESS . '.ini.php
+	';
 
 
 // aliasowanie do localhosta konfigow do testow systemu
 // aliasowanie do localhosta konfigow do testow systemu
 $domainList = INSTALL_SES_PROCESY_A::fetch_same_domains_for_install($SERVER_ADDRESS_SHORT, $SERVER_ADDRESS);// [ $SERVER_ADDRESS, localhost, 127.0.0.1, ... ]
 $domainList = INSTALL_SES_PROCESY_A::fetch_same_domains_for_install($SERVER_ADDRESS_SHORT, $SERVER_ADDRESS);// [ $SERVER_ADDRESS, localhost, 127.0.0.1, ... ]
@@ -2806,13 +2796,13 @@ function INSTALL_SES_PROCESY_A() {
 	 	// or 1) prepare config_base_structure_dump.sql and upload it to target server
 	 	// or 1) prepare config_base_structure_dump.sql and upload it to target server
 	 	//    2) load this dump to some new database
 	 	//    2) load this dump to some new database
 	 	//	  3) use /garbage (phpMyAdmin) to copy/overwrite this tables: CRM_PROCES, CRM_WSKAZNIK, CRM_LISTA_ZASOBOW, CRM_TESTY_PYTANIA, CRM_IMAGE and CRM_IMPORT_TRANSLATE
 	 	//	  3) use /garbage (phpMyAdmin) to copy/overwrite this tables: CRM_PROCES, CRM_WSKAZNIK, CRM_LISTA_ZASOBOW, CRM_TESTY_PYTANIA, CRM_IMAGE and CRM_IMPORT_TRANSLATE
-	 	//	  4) try to simulate instalator in following steps (exec this): 
+	 	//	  4) try to simulate instalator in following steps (exec this):
 	 	//		insert ignore into CRM_LISTA_ZASOBOW (`ID`, `DESC`, `TYPE`) VALUES(2, 'BAZA_DANYCH', 'BAZA_DANYCH') ;
 	 	//		insert ignore into CRM_LISTA_ZASOBOW (`ID`, `DESC`, `TYPE`) VALUES(2, 'BAZA_DANYCH', 'BAZA_DANYCH') ;
 	 	//		insert ignore into CRM_LISTA_ZASOBOW (`ID`,`PARENT_ID`, `DESC`, `TYPE`,`A_STATUS`) VALUES(3,0, 'test_procesy5_pl', 'PODMIOT','NORMAL') ; //(replace test_procesy5_pl)
 	 	//		insert ignore into CRM_LISTA_ZASOBOW (`ID`,`PARENT_ID`, `DESC`, `TYPE`,`A_STATUS`) VALUES(3,0, 'test_procesy5_pl', 'PODMIOT','NORMAL') ; //(replace test_procesy5_pl)
 	 	// 		update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$SERVER_ADDRESS.'\' where \\`DESC\\`=\'biuro.biall-net.pl\' and \\`TYPE\\`=\'SERWER\' and ID=1 "; //replace $SERVER_ADDRESS with properly target server
 	 	// 		update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$SERVER_ADDRESS.'\' where \\`DESC\\`=\'biuro.biall-net.pl\' and \\`TYPE\\`=\'SERWER\' and ID=1 "; //replace $SERVER_ADDRESS with properly target server
 	 	//		update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' where \\`DESC\\`=\'SES_USERS2\' and \\`TYPE\\`=\'BAZA_DANYCH\' and ID=2 "; //replace $REMOTE_FOLDER_ROOT with properly target server escaped string
 	 	//		update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' where \\`DESC\\`=\'SES_USERS2\' and \\`TYPE\\`=\'BAZA_DANYCH\' and ID=2 "; //replace $REMOTE_FOLDER_ROOT with properly target server escaped string
 	 	//		exec  php bash_install_check.php test_procesy5_pl; //replace test_procesy5_pl with properly target server
 	 	//		exec  php bash_install_check.php test_procesy5_pl; //replace test_procesy5_pl with properly target server
-	 	
+
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of3/4/1 FROM_ZASOBY_TO_ZASOBY',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);flush();$out="";$exit="";
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of3/4/1 FROM_ZASOBY_TO_ZASOBY',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);flush();$out="";$exit="";
 	 	//tutaj bedzie TODO mysqldump do katalogu installera i komendy z tym zwiazane musza byc jakies - przekopiuj dumpa, odpal go w bazie glownej
 	 	//tutaj bedzie TODO mysqldump do katalogu installera i komendy z tym zwiazane musza byc jakies - przekopiuj dumpa, odpal go w bazie glownej
 	 	$exec='php -r"include(\''.$INSTALL_ROOT.'/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'test_db\',\'test_db\',0,\'WYSLIJ_DO_BAZY\',\'SYNC_ZASOBY_STRUCTURES_FROM_CONFIG\'); " '.$_SERVER['SERVER_NAME'].' FILTR'; //todo pare razy trzaba powtarzac bo sa bledy
 	 	$exec='php -r"include(\''.$INSTALL_ROOT.'/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'test_db\',\'test_db\',0,\'WYSLIJ_DO_BAZY\',\'SYNC_ZASOBY_STRUCTURES_FROM_CONFIG\'); " '.$_SERVER['SERVER_NAME'].' FILTR'; //todo pare razy trzaba powtarzac bo sa bledy