This repository was archived by the owner on Sep 6, 2026. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Admin Thoughts
Iain C Docherty edited this page Feb 11, 2016
·
9 revisions
- The build process could perhaps be simplified. e.g. have a non-overlapping repository. All common code would be in the LSO repository, specific code for the environments (PT or US1), for example config or Cult code, would be in a separate repository. Most updates to the PT or US1 might then just be an update of the LSO code without a need to do merging across repositories.
- Do we need to do anything better with the admin screens, or are they good enough?
- We retain the two repositories, Lacuna-Server-Open (LSO) and Lacuna-Server (LS) but change the contents and branches slightly.
- LSO contains all of the open-source code (as it does currently)
- LSO has a 'develop' branch rather like we have now. This is an eternal branch (never deleted) and contains any code we are developing for the next release. This is maintained with a linear history.
- we also have a 'pt' and a 'us1' branch, but these act more like mutable tags than branches, we never commit directly to them, we only fast-forward them along the 'develop' branch to point to the commit that we are releasing.
- by using github hooks, we can automatically deploy the code to the PT or US1 servers when the relevant branch is modified
- since we are only moving the 'pt' and 'us1' branches forward along the develop branch to make a release, we can equally move it backwards to easily revert a release.
- LS is stripped back to remove all code which is the same as in LSO retaining only the following
- 'private' code, such as the cult script
- configuration files, such as nginx.conf, mime.types, certificates etc.
- files common to 'pt' and 'us1' (e.g. the cult script) are on a 'private' eternal branch
- files only on 'pt' or 'us1', such as config files, are on the eternal 'pt' and 'us1' branches respectively.
- we may want to move index.html out of the LS repository and put it into the Lacuna-Web-Client (this needs more thought).