]> git.immae.eu Git - github/shaarli/Shaarli.git/blame - doc/md/Upgrade-and-migration.md
doc: update references to config(.json)?.php
[github/shaarli/Shaarli.git] / doc / md / Upgrade-and-migration.md
CommitLineData
fdf88d19 1## Preparation
53ed6d7d 2
b230bf20
A
3### Note your current version
4
48679a15 5If anything goes wrong, it's important for us to know which version you're upgrading from.
b230bf20
A
6The current version is present in the `version.php` file.
7
fdf88d19
A
8### Backup your data
9
10Shaarli stores all user data under the `data` directory:
43ad7c8e 11
48679a15 12- `data/config.json.php` (or `data/config.php` for older Shaarli versions) - main configuration file
fdf88d19
A
13- `data/datastore.php` - bookmarked links
14- `data/ipbans.php` - banned IP addresses
b230bf20 15- `data/updates.txt` - contains all automatic update to the configuration and datastore files already run
fdf88d19 16
ba624567 17See [Shaarli configuration](Shaarli-configuration) for more information about Shaarli resources.
fdf88d19
A
18
19It is recommended to backup this repository _before_ starting updating/upgrading Shaarli:
43ad7c8e 20
fdf88d19
A
21- users with SSH access: copy or archive the directory to a temporary location
22- users with FTP access: download a local copy of your Shaarli installation using your favourite client
23
24### Migrating data from a previous installation
53ed6d7d 25
fdf88d19
A
26As all user data is kept under `data`, this is the only directory you need to worry about when migrating to a new installation, which corresponds to the following steps:
27
28- backup the `data` directory
29- install or update Shaarli:
ba624567 30 - fresh installation - see [Download and installation](Download-and-installation)
fdf88d19
A
31 - update - see the following sections
32- check or restore the `data` directory
33
b230bf20 34## Recommended : Upgrading from release archives
fdf88d19 35
53ed6d7d 36All tagged revisions can be downloaded as tarballs or ZIP archives from the [releases](https://github.com/shaarli/Shaarli/releases) page.
37
ba624567 38We recommend that you use the latest release tarball with the `-full` suffix. It contains the dependencies, please read [Download and installation](Download-and-installation) for `git` complete instructions.
fdf88d19 39
b230bf20 40Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the content of the `data` directory!
fdf88d19 41
48679a15 42If you use translations in gettext mode - meaning you manually changed the default mode -,
1a47014f
A
43reload your web server.
44
45After upgrading, access your fresh Shaarli installation from a web browser; the configuration and data store will then be automatically updated, and new settings added to `data/config.json.php` (see [Shaarli configuration](Shaarli configuration) for more details).
fdf88d19
A
46
47## Upgrading with Git
53ed6d7d 48
fdf88d19 49### Updating a community Shaarli
53ed6d7d 50
51If you have installed Shaarli from the [community Git repository](Download#clone-with-git-recommended), simply [pull new changes](https://www.git-scm.com/docs/git-pull) from your local clone:
fdf88d19
A
52
53```bash
54$ cd /path/to/shaarli
55$ git pull
56
57From github.com:shaarli/Shaarli
58 * branch master -> FETCH_HEAD
59Updating ebd67c6..521f0e6
60Fast-forward
61 application/Url.php | 1 +
62 shaarli_version.php | 2 +-
63 tests/Url/UrlTest.php | 1 +
64 3 files changed, 3 insertions(+), 1 deletion(-)
65```
66
53ed6d7d 67Shaarli >= `v0.8.x`: install/update third-party PHP dependencies using [Composer](https://getcomposer.org/):
fdf88d19
A
68
69```bash
b230bf20 70$ composer install --no-dev
fdf88d19
A
71
72Loading composer repositories with package information
73Updating dependencies
74 - Installing shaarli/netscape-bookmark-parser (v1.0.1)
75 Downloading: 100%
76```
77
1a47014f
A
78Shaarli >= `v0.9.2` supports translations:
79
80```bash
81$ make translate
82```
83
84If you use translations in gettext mode, reload your web server.
85
fdf88d19 86### Migrating and upgrading from Sebsauvage's repository
53ed6d7d 87
88If you have installed Shaarli from [Sebsauvage's original Git repository](https://github.com/sebsauvage/Shaarli), you can use [Git remotes](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) to update your working copy.
fdf88d19
A
89
90The following guide assumes that:
43ad7c8e 91
53ed6d7d 92- you have a basic knowledge of Git [branching](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) and [remote repositories](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes)
fdf88d19
A
93- the default remote is named `origin` and points to Sebsauvage's repository
94- the current branch is `master`
53ed6d7d 95 - if you have personal branches containing customizations, you will need to [rebase them](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) after the upgrade; beware though, a lot of changes have been made since the community fork has been created, so things are very likely to break!
fdf88d19
A
96- the working copy is clean:
97 - no versioned file has been locally modified
98 - no untracked files are present
99
100#### Step 0: show repository information
53ed6d7d 101
fdf88d19
A
102```bash
103$ cd /path/to/shaarli
104
105$ git remote -v
106origin https://github.com/sebsauvage/Shaarli (fetch)
107origin https://github.com/sebsauvage/Shaarli (push)
108
109$ git branch -vv
53ed6d7d 110* master 029f75f [origin/master] Update README.md
fdf88d19
A
111
112$ git status
113On branch master
114Your branch is up-to-date with 'origin/master'.
115nothing to commit, working directory clean
116```
117
118#### Step 1: update Git remotes
53ed6d7d 119
fdf88d19
A
120```
121$ git remote rename origin sebsauvage
122$ git remote -v
123sebsauvage https://github.com/sebsauvage/Shaarli (fetch)
124sebsauvage https://github.com/sebsauvage/Shaarli (push)
125
126$ git remote add origin https://github.com/shaarli/Shaarli
127$ git fetch origin
128
129remote: Counting objects: 3015, done.
130remote: Compressing objects: 100% (19/19), done.
131remote: Total 3015 (delta 446), reused 457 (delta 446), pack-reused 2550
132Receiving objects: 100% (3015/3015), 2.59 MiB | 918.00 KiB/s, done.
133Resolving deltas: 100% (1899/1899), completed with 48 local objects.
134From https://github.com/shaarli/Shaarli
53ed6d7d 135 * [new branch] master -> origin/master
136 * [new branch] stable -> origin/stable
137[...]
138 * [new tag] v0.6.4 -> v0.6.4
139 * [new tag] v0.7.0 -> v0.7.0
fdf88d19
A
140```
141
142#### Step 2: use the stable community branch
143
144```bash
145$ git checkout origin/stable -b stable
146Branch stable set up to track remote branch stable from origin.
147Switched to a new branch 'stable'
148
149$ git branch -vv
53ed6d7d 150 master 029f75f [sebsauvage/master] Update README.md
151* stable 890afc3 [origin/stable] Merge pull request #509 from ArthurHoaro/v0.6.5
fdf88d19
A
152```
153
53ed6d7d 154Shaarli >= `v0.8.x`: install/update third-party PHP dependencies using [Composer](https://getcomposer.org/):
fdf88d19
A
155
156```bash
b230bf20 157$ composer install --no-dev
fdf88d19
A
158
159Loading composer repositories with package information
160Updating dependencies
161 - Installing shaarli/netscape-bookmark-parser (v1.0.1)
162 Downloading: 100%
163```
164
1a47014f
A
165Shaarli >= `v0.9.2` supports translations:
166
167```bash
168$ make translate
169```
170
171If you use translations in gettext mode, reload your web server.
172
fdf88d19
A
173Optionally, you can delete information related to the legacy version:
174
175```bash
176$ git branch -D master
177Deleted branch master (was 029f75f).
178
179$ git remote remove sebsauvage
180
181$ git remote -v
182origin https://github.com/shaarli/Shaarli (fetch)
183origin https://github.com/shaarli/Shaarli (push)
184
185$ git gc
186Counting objects: 3317, done.
187Delta compression using up to 8 threads.
188Compressing objects: 100% (1237/1237), done.
189Writing objects: 100% (3317/3317), done.
190Total 3317 (delta 2050), reused 3301 (delta 2034)to
191```
192
193#### Step 3: configuration
53ed6d7d 194
48679a15
V
195After migrating, access your fresh Shaarli installation from a web browser; the
196configuration will then be automatically updated, and new settings added to
197`data/config.json.php` (see [Shaarli configuration](Shaarli-configuration) for more
198details).
b230bf20
A
199
200## Troubleshooting
201
43ad7c8e 202If the solutions provided here don't work, please open an issue specifying which version you're upgrading from and to.
b230bf20
A
203
204### You must specify an integer as a key
205
206In `v0.8.1` we changed how link keys are handled (from timestamps to incremental integers).
207Take a look at `data/updates.txt` content.
208
209#### `updates.txt` contains `updateMethodDatastoreIds`
210
211Try to delete it and refresh your page while being logged in.
212
43ad7c8e 213#### `updates.txt` doesn't exist or doesn't contain `updateMethodDatastoreIds`
b230bf20 214
43ad7c8e
V
2151. Create `data/updates.txt` if it doesn't exist
2162. Paste this string in the update file `;updateMethodRenameDashTags;`
2173. Login to Shaarli
2184. Delete the update file
2195. Refresh