Procházet zdrojové kódy

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

Piotr Labudda před 10 roky
rodič
revize
4c93057168
2 změnil soubory, kde provedl 76 přidání a 1 odebrání
  1. binární
      SE/stuff/p5_BeeCtrl.zip
  2. 76 1
      SE/superedit-INSTALL_SES_PROCESY_A.php

binární
SE/stuff/p5_BeeCtrl.zip


+ 76 - 1
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -896,8 +896,77 @@ require_once(ABSPATH . \'wp-settings.php\');
 
 
 " >/Library/Server/Web/Data/Sites/Default/wordpress/wp-config.php ';
+$cmd[]['rsh']='chmod -R o+rwx /Library/Server/Web/Data/Sites/Default/wordpress/wp-content';
+$cmd[]['rsh']='chmod -R g+rwx /Library/Server/Web/Data/Sites/Default/wordpress/wp-content';
+//aktywacja idzie nizej modulem CLI 
+//$cmd[]['rsh']='wget --no-check-certificate --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';
+
+
+
+$cmd[]['rsh']='echo "
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.' = create
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':Listen:_array_index:0 ="0.0.0.0:80"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':ServerName = www.'.$SERVER_ADDRESS_SHORT.'
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':ServerAdmin =admin@www.'.$SERVER_ADDRESS_SHORT.'
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':DirectoryIndex:_array_index:0= "index.html"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':DirectoryIndex:_array_index:1= "index.php"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':WebMail = yes
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':CustomLog:_array_index:0:Format = "%{User-agent}i"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':CustomLog:_array_index:0:enabled = yes
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':CustomLog:_array_index:0:ArchiveInterval = 0
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':CustomLog:_array_index:0:Path = "/private/var/log/httpd/access_log"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':CustomLog:_array_index:0:Archive = yes
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':Directory:_array_id:/Library/WebServer/Documents:Options:Indexes = yes
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':Directory:_array_id:/Library/WebServer/Documents:Options:ExecCGI = no
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':Directory:_array_id:/Library/WebServer/Documents:AuthName = "Test Site"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':ErrorLog:ArchiveInterval = 0
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':ErrorLog:Path = "/private/var/log/httpd/error_log"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':ErrorLog:Archive = no
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':Include:_array_index:0 = "/etc/httpd/httpd_squirrelmail.conf"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':enabled = yes
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':ErrorDocument:_array_index:0:StatusCode = 404
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':ErrorDocument:_array_index:0:Document = "/nwesite_notfound.html"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':LogLevel = "warn"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':IfModule:_array_id:mod_ssl.c:SSLEngine = no
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':IfModule:_array_id:mod_ssl.c:SSLPassPhrase = ""
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':IfModule:_array_id:mod_ssl.c:SSLLog = "/private/var/log/httpd/ssl_engine_log"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.':DocumentRoot = "/Library/Server/Web/Data/Sites/Default/wordpress"
+web:Sites:_array_id:0.0.0.0\:80www.'.$SERVER_ADDRESS_SHORT.'
+
+" > addsite_wordpress.in
+'; //todo add site
+
+
+$cmd[]['rsh']='[ -f /tmp/wp-cli.phar ] && rm /tmp/wp-cli.phar || echo passed';
+
+$cmd[]['rsh']='cd /tmp && wget https://raw.github.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O wp-cli.phar';
+$cmd[]['rsh']='chmod +x /tmp/wp-cli.phar';
+$cmd[]['rsh']='mkdir -p /opt/local/wordpress/bin';
+$cmd[]['rsh']='[ -f /opt/local/wordpress/bin/wp ] && rm /opt/local/wordpress/bin/wp || echo passed';
+$cmd[]['rsh']='mv /tmp/wp-cli.phar /opt/local/wordpress/bin/wp';
+
+
+//'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';
+//aktywacja wordpressa modulem CLI
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp core install --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress --url='.$SERVER_ADDRESS.'/wordpress --title='.$SERVER_ADDRESS.' --admin_user='.$ADMIN_USERNAME_L1.' --admin_password='.$ADMIN_USERNAME_L1_PASS.' --admin_email='.$ADMIN_USERNAME_L1.'@'.$SERVER_ADDRESS_SHORT;
+
+
+
+
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin install ldap-login-password-and-role-manager --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+//17:
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin activate ldap-login-password-and-role-manager --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_base_dn "cn=users,'.$SERVER_ADDRESS_LDAP_DC.'" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_domain_controllers "'.$SERVER_ADDRESS_SHORT.'" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_loginattr "uid" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_lnameattr "uid" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_emailattr "mail" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+
+//! wordpress procesy5 plugin begin! 
+//@2016-05 TODO póki nie ma danych z clone repo - tutaj wrzucamy wersje aktualna modulu do wordpressa 
+$cmd[]['rsh']='unzip -o /Library/Server/Web/Data/Sites/Default/SE/stuff/p5_BeeCtrl.zip -d /Library/Server/Web/Data/Sites/Default/wordpress/wp-content/plugins';
+
 
-$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;
@@ -2173,6 +2242,12 @@ function INSTALL_SES_PROCESY_A() {
 			exec($cmd,$out,$exit);
 			DEBUG_S(-3,'Klonowanie aktualnego GIT - create VERSION file ',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
 
+
+			//@2016-05 klonowanie modulu wordpressa do wspolnej paczki instalacji ; poki nie dziala - korzystamy z stuff/p5_BeeCtrl.zip
+			$cmd='cd '.$installer_dir_tar.' &&   git -C '.$installer_dir_tar.'/'.$h->ID.'.'.$REMOTE_FOLDER_ROOT.'.git clone ssh://git@biuro.biall-net.pl:2222/pawel.kamola/generator_worpressa.git ' ;
+			exec($cmd,$out,$exit);
+			DEBUG_S(-3,'Klonowanie z aktualnego GIT modul wordpress ',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
+
 			}
 			/*
             if (1==0) { //@2015-01-27 - proba zrobienia zwyklego clone