Skip to content

Commit

Permalink
README: Document making changes
Browse files Browse the repository at this point in the history
Fixes #5
References #6, basically describing the steps which are needed.
  • Loading branch information
jonnor committed Jul 14, 2016
1 parent a3ec127 commit feb0976
Showing 1 changed file with 46 additions and 1 deletion.
47 changes: 46 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,54 @@

The code for [Bitraf.no](http://bitraf.no) website.

## Structure

Most of the Bitraf website is actually wiki-pages.

The frontpage/landing-page is however stored here.

## Making changes

`TODO: Document`
You can use the Github webinterface to make changes. This is recommended for simple cases, like fixing a typo or improving the text.

First, [log into or sign up](github.com/login) to Github.

When logged in you can click [any file](https://github.com/bitraf/web/tree/master/) in this repository,
and then hit the *pencil icon* on the file toolbar to edit. More documentation [here](https://help.github.com/articles/editing-files-in-your-repository/).

To edit the frontpage, here is link to edit [index.php](https://github.com/bitraf/web/edit/master/index.php)

One you have made the change, add a description of what you did "Fixed typo", and hit *Commit*.

## Deploy changes

[TODO: automate deployment](https://github.com/bitraf/web/issues/6)

Log in to the server

ssh bitraf.no

Pull the changes into staging

cd /home/bitweb/web/staging
git pull

Check on staging that everything looks good: https://bitraf.no:4433/

# all good?

Pull the changes into live

cd /home/bitweb/web/staging
git pull

Double-check the changes on live site: https://bitraf.no


## Using your own clone (advanced)

The steps above assumes you made the changes directly in the main repository (https://github.com/bitraf/web).
If you used your own clone, you can easily work with it by adding another git remote: `git remote add jonnor MY-CLONE-URL`, and do `git checkout jonnor/mybranch`. NB: Remember to always push your changes to main repo when you're happy with them!


## Server setup
Expand Down

0 comments on commit feb0976

Please sign in to comment.