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

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -55,6 +55,8 @@ class INSTALL_SES_PROCESY_A {
 			while($h2=DB::fetch($res2)) {
 			 	$domain[]=' --domain '.$h2->SERVER_ADDRESS_SHORT;
 			}
+			$domain[]=' --domain 127.0.0.1';
+			$domain[]=' --domain localhost';
 		}
 		return implode(' ', $domain);
 	}
@@ -664,7 +666,7 @@ if($SERVER_VERSION=='10.11-ElCapitan') {
 //EOF TO MOVE TO INSTALL_GETCOMMANDS_COMP_PORT_MYSQL
  $cmd[]['rsh']='cat /etc/paths |grep "/opt/local/bin" || echo "/opt/local/bin" >>/etc/paths';
  $cmd[]['rsh']=' grep "/opt/local/bin" /etc/paths || echo "/opt/local/bin" >>/etc/paths'; //dodanie do sciezek
- $cmd[]['rsh']=" sed  -i.bak  \"s/PS1='\\\h:/PS1='\\\H:/g\" /etc/bashrc"; //zmiana wyswietlania kurosra hosta
+ $cmd[]['rsh']=" sed  -i.bak  \"s/PS1='\\\\\h:/PS1='\\\\\H:/g\" /etc/bashrc"; //zmiana wyswietlania kurosra hosta
  $cmd[]['rsh']='which wget || port install wget';
  $cmd[]['rsh']='which joe || port install joe';
  $cmd[]['rsh']='which gnutar || port install gnutar';
@@ -672,7 +674,6 @@ if($SERVER_VERSION=='10.11-ElCapitan') {
 
 
 
-
  return $cmd;
 
 
@@ -680,7 +681,7 @@ if($SERVER_VERSION=='10.11-ElCapitan') {
 
 
 
-function INSTALL_GETCOMMANDS_POSTGIS($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) {
+function INSTALL_GETCOMMANDS_POSTGIS($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) {
 
 // ! instalacja mapservera oraz komponentow sluzacych do obslugi spatialnej
 //stuff/GDAL_Complete-1.11.dmg
@@ -808,6 +809,102 @@ $cmd[]['rsh']='sed -i.bak "s/\\\'extra_login_security\\\'\].*=.*true/\\\'extra_l
 return $cmd;
 }
 
+function INSTALL_GETCOMMANDS_WORDPRESS($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-05- bindera: dodajemy instalke wordpressa
+
+$cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && rm wordpress.tar.gz || echo PASSED";
+$cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && wget https://wordpress.org/latest.tar.gz -O wordpress.tar.gz";
+$cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && tar -zxpvf wordpress.tar.gz";
+
+$cmd[]['rsh']='which mysqladmin && mysqladmin  -f -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' drop '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED ';
+$cmd[]['rsh']='mysqladmin -h 127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' create '.$REMOTE_FOLDER_ROOT.'_wordpress';
+$cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON '.$REMOTE_FOLDER_ROOT.'_wordpress.* to \'wordpress\'@\'127.0.0.1\' IDENTIFIED BY \''.md5($ADMIN_USERNAME_PASSWD).'\'  WITH GRANT OPTION; flush privileges;" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\''; 
+$cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON '.$REMOTE_FOLDER_ROOT.'_wordpress.* to \'wordpress\'@\'localhost\' IDENTIFIED BY \''.md5($ADMIN_USERNAME_PASSWD).'\'  WITH GRANT OPTION; flush privileges;" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
+
+$cmd[]['rsh']='echo "
+<?php 
+/** The name of the database for WordPress */
+define(\'DB_NAME\', \''.$REMOTE_FOLDER_ROOT.'_wordpress\');
+
+/** MySQL database username */
+define(\'DB_USER\', \'wordpress\');
+
+/** MySQL database password */
+define(\'DB_PASSWORD\', \''.md5($ADMIN_USERNAME_PASSWD).'\');
+
+/** MySQL hostname */
+define(\'DB_HOST\', \'127.0.0.1\');
+
+/** Database Charset to use in creating database tables. */
+define(\'DB_CHARSET\', \'utf8\');
+
+/** The Database Collate type. Don\'t change this if in doubt. */
+define(\'DB_COLLATE\', \'\');
+
+/**#@+
+ * Authentication Unique Keys and Salts.
+ *
+ * Change these to different unique phrases!
+ * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
+ * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
+ *
+ * @since 2.6.0
+ */
+
+define(\'AUTH_KEY\',         \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD).'\');
+
+define(\'SECURE_AUTH_KEY\',  \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD."1").'\');
+define(\'LOGGED_IN_KEY\',    \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD."2").'\');
+define(\'NONCE_KEY\',        \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD."3").'\');
+define(\'AUTH_SALT\',        \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD."4").'\');
+define(\'SECURE_AUTH_SALT\', \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD."5").'\');
+define(\'LOGGED_IN_SALT\',   \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD."6").'\');
+define(\'NONCE_SALT\',       \''.md5($REMOTE_FOLDER_ROOT.$ADMIN_USERNAME_PASSWD."7").'\');
+
+
+
+/**
+ * WordPress Database Table prefix.
+ *
+ * You can have multiple installations in one database if you give each
+ * a unique prefix. Only numbers, letters, and underscores please!
+ */
+\$table_prefix  = \'wp_\';
+
+/**
+ * For developers: WordPress debugging mode.
+ *
+ * Change this to true to enable the display of notices during development.
+ * It is strongly recommended that plugin and theme developers use WP_DEBUG
+ * in their development environments.
+ *
+ * For information on other constants that can be used for debugging,
+ * visit the Codex.
+ *
+ * @link https://codex.wordpress.org/Debugging_in_WordPress
+ */
+define(\'WP_DEBUG\', false);
+
+/* Thats all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined(\'ABSPATH\') )
+	define(\'ABSPATH\', dirname(__FILE__) . \'/\');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . \'wp-settings.php\');
+
+
+" >/Library/Server/Web/Data/Sites/Default/wordpress/wp-config.php ';
+
+$cmd[]['rsh']='wget --post-data=\'weblog_title='.$SERVER_ADDRESS_SHORT.'&user_name='.$ADMIN_USERNAME_L1.'&admin_password='.$ADMIN_USERNAME_L1_PASS.'&admin_password2='.$ADMIN_USERNAME_L1_PASS.'&admin_email='.$ADMIN_USERNAME_L1.'@'.$SERVER_ADDRESS_SHORT.'&submit=1\' http://'.$SERVER_ADDRESS.'/wordpress/wp-admin/install.php?step=2';
+
+
+return $cmd;
+
+
+}
+
 
 
 function INSTALL_GETCOMMANDS_MYSQL55($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) {
@@ -1668,9 +1765,9 @@ $cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--z
 //! dodanie pierwszego usera ADMIN_USERNAME_L1 oraz diradmin
 
 //!#1228 2016-04-11 bindera: dodaje to tez tutaj - bo chyba tutaj powinno byc wszystko sprawne i dzialajace
-//$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;
+$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-27 jednak to tutaj nie dziala....
-
+//@2016-04-28 piotr dodal aktualizacje congig_check do dodawania tabeli config - i sprawdzamy czy pomoglo w tym etapie
 return $cmd;
 
 }
@@ -2205,6 +2302,17 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.MYADMIN']['xml_choice']['description']='Component located at /garbage URL, to manage database';
 		$packages['pl.procesy5.MYADMIN']['xml_choice']['start_selected']='true';
 
+//! pakiet: INSTALL_GETCOMMANDS_WORDPRESS
+		$packages['pl.procesy5.WORDPRESS']['exit_file']=str_replace('.', '_', $h->ID.".POSTGIS_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
+		$packages['pl.procesy5.WORDPRESS']['installer_dir_name']=$h->ID.".WORDPRESS_".$h->SERVER_ADDRESS; //nazwa katalogu w jakim jest przygotowywany pkg
+		$packages['pl.procesy5.WORDPRESS']['installer_tmp']="/tmp/pl.procesy5_WORDPRESS_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
+		$packages['pl.procesy5.WORDPRESS']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_WORDPRESS"; //miejsce do ktorego installer odpakuje wszystko instalator
+		$packages['pl.procesy5.WORDPRESS']['xml_choice']['visible']='true';
+		$packages['pl.procesy5.WORDPRESS']['xml_choice']['title']='wordpress current';
+		$packages['pl.procesy5.WORDPRESS']['xml_choice']['description']='Wordpress configured site with admin access';
+		$packages['pl.procesy5.WORDPRESS']['xml_choice']['start_selected']='true';
+
+