| | 12 | |
| | 13 | = General deployment and updates = |
| | 14 | |
| | 15 | social's web front end is apache with php5-fpm. It's the same basic setup we use on moshes. |
| | 16 | |
| | 17 | social's code is stored in a git repository: {{{git://git.mayfirst.org/mfpl/gnusocial}}}. Branches in this repository are: |
| | 18 | * master - based on the upstream master branch, with no modifications |
| | 19 | * mfpl-master. A copy of the master branch, with mfpl modifications |
| | 20 | * mfpl-1.1.x. A copy of the upstream 1.1.x branch, with mfpl modifications |
| | 21 | * mfpl-1.2.x. A copy of the upstream 1.2.x branch, which we've never used. |
| | 22 | |
| | 23 | We deploy code from tags on the mfpl-master branch. For example |
| | 24 | {{{ |
| | 25 | 0 gnusocial@howard:~/social.mayfirst.org/web$ git status |
| | 26 | HEAD detached at social-20170905.1 |
| | 27 | |
| | 28 | # social-20170905.1 is a signed tag |
| | 29 | }}} |
| | 30 | |
| | 31 | For updates, the general idea is to |
| | 32 | |
| | 33 | * clone {{{git://git.mayfirst.org/mfpl/gnusocial}}}. Call this remote `gmo' |
| | 34 | * clone the vendor git repository. Call this remote `origin' |
| | 35 | * move changes from origin/master -> mfpl-master |
| | 36 | * test. At the moment, you'll need to set up your own environment for testing. |
| | 37 | * create a signed tag on the commit you'd like to deploy. |
| | 38 | * {{{git push gmo mfpl-master; git push gmo --tags}}} |
| | 39 | * on howard, {{{git fetch gmo}}}, then checkout the tag. |
| | 40 | |
| | 41 | In short, the preferred workflow is to do the work on a test instance, then deploy the changes to howard. |