Skip to content

Commit

Permalink
version 4.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
briankelleher committed Apr 26, 2016
1 parent 84cb566 commit 905e5b8
Show file tree
Hide file tree
Showing 570 changed files with 23,846 additions and 9,672 deletions.
102 changes: 46 additions & 56 deletions appspec.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# This is an appspec.yml template file for use with AWS CodeDeploy.
# The lines in this template starting with the hashtag symbol are
# instructional comments and can be safely left in the file or
# The lines in this template starting with the hashtag symbol are
# instructional comments and can be safely left in the file or
# ignored.
# For help completing this file, see the "AppSpec File Reference" in the
# For help completing this file, see the "AppSpec File Reference" in the
# "AWS CodeDeploy User Guide" at
# http://docs.aws.amazon.com/codedeploy/latest/userguide/app-spec-ref.html
version: 0.0
# Specify "os: linux" if this revision targets Amazon Linux,
# Red Hat Enterprise Linux (RHEL), or Ubuntu Server
# Specify "os: linux" if this revision targets Amazon Linux,
# Red Hat Enterprise Linux (RHEL), or Ubuntu Server
# instances.
# Specify "os: windows" if this revision targets Windows Server instances.
# (You cannot specify both "os: linux" and "os: windows".)
os: linux
os: linux
# os: windows
# During the Install deployment lifecycle event (which occurs between the
# BeforeInstall and AfterInstall events), copy the specified files
# in "source" starting from the root of the revision's file bundle
# During the Install deployment lifecycle event (which occurs between the
# BeforeInstall and AfterInstall events), copy the specified files
# in "source" starting from the root of the revision's file bundle
# to "destination" on the Amazon EC2 instance.
# Specify multiple "source" and "destination" pairs if you want to copy
# Specify multiple "source" and "destination" pairs if you want to copy
# from multiple sources or to multiple destinations.
# If you are not copying any files to the Amazon EC2 instance, then remove the
# "files" section altogether. A blank or incomplete "files" section
Expand All @@ -26,92 +26,82 @@ files:
- source: www
destination: /var/www/ation
# For deployments to Amazon Linux, Ubuntu Server, or RHEL instances,
# you can specify a "permissions"
# section here that describes special permissions to apply to the files
# in the "files" section as they are being copied over to
# you can specify a "permissions"
# section here that describes special permissions to apply to the files
# in the "files" section as they are being copied over to
# the Amazon EC2 instance.
# For more information, see the documentation.
# If you are deploying to Windows Server instances,
# then remove the
# then remove the
# "permissions" section altogether. A blank or incomplete "permissions"
# section may cause associated deployments to fail.
# permissions:
# - object:
# pattern:
# except:
# owner:
# group:
# mode:
# acls:
# -
# context:
# user:
# type:
# range:
# type:
# -
# If you are not running any commands on the Amazon EC2 instance, then remove
# - object: /var/www/html
# pattern: "**"
# owner: www-data
# group: www-data
# If you are not running any commands on the Amazon EC2 instance, then remove
# the "hooks" section altogether. A blank or incomplete "hooks" section
# may cause associated deployments to fail.
# hooks:
# For each deployment lifecycle event, specify multiple "location" entries
# For each deployment lifecycle event, specify multiple "location" entries
# if you want to run multiple scripts during that event.
# You can specify "timeout" as the number of seconds to wait until failing the deployment
# if the specified scripts do not run within the specified time limit for the
# specified event. For example, 900 seconds is 15 minutes. If not specified,
# You can specify "timeout" as the number of seconds to wait until failing the deployment
# if the specified scripts do not run within the specified time limit for the
# specified event. For example, 900 seconds is 15 minutes. If not specified,
# the default is 1800 seconds (30 minutes).
# Note that the maximum amount of time that all scripts must finish executing
# for each individual deployment lifecycle event is 3600 seconds (1 hour).
# Note that the maximum amount of time that all scripts must finish executing
# for each individual deployment lifecycle event is 3600 seconds (1 hour).
# Otherwise, the deployment will stop and AWS CodeDeploy will consider the deployment
# to have failed to the Amazon EC2 instance. Make sure that the total number of seconds
# that are specified in "timeout" for all scripts in each individual deployment
# to have failed to the Amazon EC2 instance. Make sure that the total number of seconds
# that are specified in "timeout" for all scripts in each individual deployment
# lifecycle event does not exceed a combined 3600 seconds (1 hour).
# For deployments to Amazon Linux, Ubuntu Server, or RHEL instances,
# you can specify "runas" in an event to
# run as the specified user. For more information, see the documentation.
# If you are deploying to Windows Server instances,
# remove "runas" altogether.
# If you do not want to run any commands during a particular deployment
# lifecycle event, remove that event declaration altogether. Blank or
# lifecycle event, remove that event declaration altogether. Blank or
# incomplete event declarations may cause associated deployments to fail.
# During the ApplicationStop deployment lifecycle event, run the commands
# in the script specified in "location" starting from the root of the
# During the ApplicationStop deployment lifecycle event, run the commands
# in the script specified in "location" starting from the root of the
# revision's file bundle.
# ApplicationStop:
# - location:
# - location:
# timeout:
# runas:
# - location:
# - location:
# timeout:
# runas:
# During the BeforeInstall deployment lifecycle event, run the commands
# runas:
# During the BeforeInstall deployment lifecycle event, run the commands
# in the script specified in "location".
BeforeInstall:
- location: beforeinstall.sh
# During the AfterInstall deployment lifecycle event, run the commands
# During the AfterInstall deployment lifecycle event, run the commands
# in the script specified in "location".
# AfterInstall:
# - location:
# timeout:
# - location:
# timeout:
# runas:
# - location:
# - location:
# timeout:
# runas:
# During the ApplicationInstall deployment lifecycle event, run the commands
# During the ApplicationInstall deployment lifecycle event, run the commands
# in the script specified in "location".
# ApplicationStart:
# - location:
# timeout:
# - location:
# timeout:
# runas:
# - location:
# - location:
# timeout:
# runas:
# During the ValidateService deployment lifecycle event, run the commands
# During the ValidateService deployment lifecycle event, run the commands
# in the script specified in "location".
# ValidateService:
# - location:
# timeout:
# - location:
# timeout:
# runas:
# - location:
# - location:
# timeout:
# runas:
2 changes: 1 addition & 1 deletion www/license.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
WordPress - Web publishing software

Copyright 2016 by the contributors
Copyright 2011-2016 by the contributors

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion www/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<h1 id="logo">
<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
<br /> Version 4.4.2
<br /> Version 4.5.1
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>

Expand Down
8 changes: 4 additions & 4 deletions www/wp-activate.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Confirms that the activation key that is sent in an email after a user signs
* up for a new blog matches the key for that user and then displays confirmation.
* up for a new site matches the key for that user and then displays confirmation.
*
* @package WordPress
*/
Expand Down Expand Up @@ -117,9 +117,9 @@ function wpmu_activate_stylesheet() {
</div>

<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
switch_to_blog( (int) $result['blog_id'] );
$login_url = wp_login_url();
restore_current_blog();
switch_to_blog( (int) $result['blog_id'] );
$login_url = wp_login_url();
restore_current_blog();
?>
<p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) ); ?></p>
<?php else: ?>
Expand Down
Loading

0 comments on commit 905e5b8

Please sign in to comment.