Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| media-frontend [2015/03/15 16:27] – remote mazdermind | media-frontend [2026/07/26 21:08] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | = media.ccc.de frontend | + | # media.ccc.de frontend |
| - | == update from git | + | ## update from git |
| - | The frontend is generated by nanoc. To increase visibility the project is hosted on github: | + | The frontend is generated by nanoc. To increase visibility the project |
| - | + | is hosted on github: | |
| - | https:// | + | |
| + | <https:// | ||
| However the deployment uses a seperate git server on koeln.media.ccc.de | However the deployment uses a seperate git server on koeln.media.ccc.de | ||
| Line 11: | Line 12: | ||
| '' | '' | ||
| - | Setup local working repository: | + | Setup local working repository: - git remote set origin |
| - | | + | git@github.com: |
| - | | + | gitolite@koeln.media.ccc.de: |
| - | | + | --hard origin/ |
| - | | + | |
| - | + | ||
| - | Usual workflow: | + | |
| - | - git co master | + | |
| - | - git pull origin | + | |
| - | - git push live # if this fails big problem | + | |
| - | - git co deployment-media.ccc.de | + | |
| - | - git rebase master | + | |
| - | - git push -f live | + | |
| - | + | ||
| - | Never push the deployment-media.ccc.de branch to github, as it contains database passwords and such. | + | |
| - | == get all torrent hashes | + | Usual workflow: - git co master - git pull origin \# resolve conflicts - |
| - | We still use the mirrorbrain generated torrents. So they don't exist in the filesystem, but are generated on the fly with matching webseeds. | + | git push live \# if this fails big problem - git co |
| + | deployment-media.ccc.de - git rebase master - git push -f live | ||
| - | < | + | Never push the deployment-media.ccc.de |
| + | database passwords and such. | ||
| - | TODO: remove mirrorbrain torrents and have real torrents in the filesystem, generate with large enough chunk size, but not to large for streaming, or remove webseeds and use dedicated seed boxes. | ||