diff options
| author | nemsia <nemsia@nemsia.org> | 2018-08-31 00:15:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 00:15:01 +0200 |
| commit | a8cd8031cd6cc85125ff7fafc10443c975cf209c (patch) | |
| tree | 217fd016f98ebb3ec6a33806a1c5bbcf82d9e87d /scripts | |
| parent | 20fe4996b6fdee3d1ff341ad953f21af0474e109 (diff) | |
| parent | 09a07f19c518c1555f7cb09fc0d84be7b55e74f1 (diff) | |
| download | mastodon_ynh-a8cd8031cd6cc85125ff7fafc10443c975cf209c.tar.gz mastodon_ynh-a8cd8031cd6cc85125ff7fafc10443c975cf209c.tar.bz2 mastodon_ynh-a8cd8031cd6cc85125ff7fafc10443c975cf209c.zip | |
Merge pull request #109 from YunoHost-Apps/patch-frju365
Nginx : CSP + typo
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 3 | ||||
| -rw-r--r-- | scripts/upgrade | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/scripts/install b/scripts/install index cd9a1ce..ffa152a 100644 --- a/scripts/install +++ b/scripts/install @@ -134,9 +134,6 @@ ynh_setup_source "$final_path/live" "app-mastodon" # NGINX CONFIGURATION #================================================= -# Create a dedicated nginx config -ynh_replace_string "__PORT_WEB__" "$port_web" "../conf/nginx.conf" -ynh_replace_string "__PORT_STREAM__" "$port_stream" "../conf/nginx.conf" ynh_add_nginx_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0429013..207858e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -116,10 +116,11 @@ ynh_secure_remove $final_path/live/config/initializers/timeout.rb # NGINX CONFIGURATION #================================================= -ynh_replace_string "__PORT_WEB__" "$port_web" "../conf/nginx.conf" -ynh_replace_string "__PORT_STREAM__" "$port_stream" "../conf/nginx.conf" ynh_add_nginx_config +#================================================= +# UPGRADE MASTODON +#================================================= # Upgrade rbenv and ruby plugins ynh_setup_source "$final_path/.rbenv" "app-rbenv" |