Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change URL for cutover #280

Merged
merged 1 commit into from
May 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ If you'd like to edit a specific devopsdays event site (and/or contribute code),
1. Before you commit any changes, create a new branch, i.e., `git checkout -b fix-that-thing`
1. Make your changes, test them locally, then push that branch up to origin on your fork (`git push origin BRANCHNAME`)
1. Submit a pull request from the branch you just pushed
1. When a commit is merged to master on github (ideally via a PR reviewed by at least one other person), wercker will automatically build the site and publish it to [http://devopsdays.github.io](http://devopsdays.github.io).
1. When a commit is merged to master on github (ideally via a PR reviewed by at least one other person), wercker will automatically build the site and publish it to [http://www.devopsdays.org](http://www.devopsdays.org).

## Creating a new event

Expand Down
2 changes: 1 addition & 1 deletion config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
theme = "devopsdays-legacy"
baseurl = "http://devopsdays.github.io/"
baseurl = "http://www.devopsdays.org/"
# baseurl = "http://localhost:1313/"
languageCode = "en-us"
GoogleAnalytics = "UA-9713393-1"
Expand Down
2 changes: 1 addition & 1 deletion wercker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ deploy:

- burrbd/gh-pages@0.2.3:
token: $GIT_TOKEN
domain: devopsdays.github.io
domain: www.devopsdays.org
basedir: public
repo: devopsdays/devopsdays.github.io
after-steps:
Expand Down