mirror of
https://github.com/YunoHost-Apps/yourls_ynh.git
synced 2024-09-03 20:35:59 +02:00
Merge branch 'testing' into language
This commit is contained in:
commit
3a960b0d64
11 changed files with 38 additions and 43 deletions
15
README.md
15
README.md
|
@ -17,15 +17,16 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
|
||||
YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly).
|
||||
|
||||
Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses.
|
||||
|
||||
### YOURLS Features
|
||||
|
||||
- Free and open-source software,
|
||||
- Private (your links only) or Public (everybody can create short links, fine for an intranet),
|
||||
- Terrific Plugin architecture and dozens of plugins to easily implement new features,
|
||||
- Handy bookmarklets to easily shorten and share links,
|
||||
- Awesome stats: historical click reports, referrers tracking, visitors geo-location,
|
||||
- Developer API to integrate YOURLS into other applications,
|
||||
- Sample files to create your own public interface and more !
|
||||
- Private (your links only) or Public (everybody can create short links, fine for an intranet)
|
||||
- Dozens of plugins to easily implement new features
|
||||
- Handy bookmarklets to easily shorten and share links
|
||||
- Awesome stats: historical click reports, referrers tracking, visitors geo-location
|
||||
- Developer API to integrate YOURLS into other applications
|
||||
- Sample files to create your own public interface
|
||||
|
||||
|
||||
**Shipped version:** 1.8.2~ynh1
|
||||
|
|
15
README_fr.md
15
README_fr.md
|
@ -13,15 +13,16 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
|||
|
||||
YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly).
|
||||
|
||||
Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses.
|
||||
|
||||
### YOURLS Features
|
||||
|
||||
- Free and open-source software,
|
||||
- Private (your links only) or Public (everybody can create short links, fine for an intranet),
|
||||
- Terrific Plugin architecture and dozens of plugins to easily implement new features,
|
||||
- Handy bookmarklets to easily shorten and share links,
|
||||
- Awesome stats: historical click reports, referrers tracking, visitors geo-location,
|
||||
- Developer API to integrate YOURLS into other applications,
|
||||
- Sample files to create your own public interface and more !
|
||||
- Private (your links only) or Public (everybody can create short links, fine for an intranet)
|
||||
- Dozens of plugins to easily implement new features
|
||||
- Handy bookmarklets to easily shorten and share links
|
||||
- Awesome stats: historical click reports, referrers tracking, visitors geo-location
|
||||
- Developer API to integrate YOURLS into other applications
|
||||
- Sample files to create your own public interface
|
||||
|
||||
|
||||
**Version incluse :** 1.8.2~ynh1
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
setup_sub_dir=1
|
||||
setup_root=1
|
||||
setup_nourl=0
|
||||
setup_private=1
|
||||
setup_private=0
|
||||
setup_public=1
|
||||
upgrade=1
|
||||
#upgrade=1 from_commit=CommitHash
|
||||
upgrade=1 from_commit=455317a9e0a55ffb2cb80f79f2a2f56af4d3d671
|
||||
backup_restore=1
|
||||
multi_instance=1
|
||||
change_url=1
|
||||
|
@ -20,6 +20,6 @@
|
|||
Email=
|
||||
Notification=none
|
||||
;;; Upgrade options
|
||||
; commit=CommitHash
|
||||
name=Name and date of the commit.
|
||||
; commit=455317a9e0a55ffb2cb80f79f2a2f56af4d3d671
|
||||
name=Merge pull request #17
|
||||
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
|
||||
|
|
|
@ -39,6 +39,8 @@ define( 'YOURLS_DB_PREFIX', 'yourls_' );
|
|||
** To use an IDN domain (eg http://héhé.com), write its ascii form here (eg http://xn--hh-bjab.com) */
|
||||
define( 'YOURLS_SITE', 'http://__DOMAIN____PATH__' );
|
||||
|
||||
define('YOURLS_ADMIN_SSL', true);
|
||||
|
||||
/** YOURLS language
|
||||
** Change this setting to use a translation file for your language, instead of the default English.
|
||||
** That translation file (a .mo file) must be installed in the user/language directory.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<html lang="en-US">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>YOURLS</title>
|
||||
<title>YOURLS — Your Own URL Shortener</title>
|
||||
<link rel="stylesheet" href="css/style.css"/>
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly).
|
||||
|
||||
Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses.
|
||||
|
||||
### YOURLS Features
|
||||
|
||||
- Free and open-source software,
|
||||
- Private (your links only) or Public (everybody can create short links, fine for an intranet),
|
||||
- Terrific Plugin architecture and dozens of plugins to easily implement new features,
|
||||
- Handy bookmarklets to easily shorten and share links,
|
||||
- Awesome stats: historical click reports, referrers tracking, visitors geo-location,
|
||||
- Developer API to integrate YOURLS into other applications,
|
||||
- Sample files to create your own public interface and more !
|
||||
- Private (your links only) or Public (everybody can create short links, fine for an intranet)
|
||||
- Dozens of plugins to easily implement new features
|
||||
- Handy bookmarklets to easily shorten and share links
|
||||
- Awesome stats: historical click reports, referrers tracking, visitors geo-location
|
||||
- Developer API to integrate YOURLS into other applications
|
||||
- Sample files to create your own public interface
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
},
|
||||
"version": "1.8.2~ynh1",
|
||||
"url": "https://yourls.org/",
|
||||
"license": "MIT",
|
||||
"upstream": {
|
||||
"license": "MIT",
|
||||
"website": "https://yourls.org/",
|
||||
|
@ -16,6 +15,7 @@
|
|||
"admindoc": "https://github.com/YOURLS/YOURLS/wiki",
|
||||
"code": "https://github.com/YOURLS/YOURLS"
|
||||
},
|
||||
"license": "MIT",
|
||||
"maintainer": {
|
||||
"name": "Anmol Sharma",
|
||||
"email": "anmol@datamol.org"
|
||||
|
@ -53,17 +53,7 @@
|
|||
{
|
||||
"name": "password",
|
||||
"type": "password"
|
||||
},
|
||||
{
|
||||
"name": "language",
|
||||
"type": "string",
|
||||
"ask": {
|
||||
"en": "Choose the application language",
|
||||
"fr": "Choisissez la langue de l'application"
|
||||
},
|
||||
"choices": ["fr", "en"],
|
||||
"default": "fr"
|
||||
},
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
YNH_PHP_VERSION="7.4"
|
||||
|
||||
# dependencies used by the app
|
||||
pkg_dependencies="php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php-pear"
|
||||
pkg_dependencies="php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml"
|
||||
|
||||
#=================================================
|
||||
# PERSONAL HELPERS
|
||||
|
|
|
@ -26,7 +26,6 @@ app=$YNH_APP_INSTANCE_NAME
|
|||
#=================================================
|
||||
ynh_script_progression --message="Loading installation settings..." --weight=1
|
||||
|
||||
# Needed for helper "ynh_add_nginx_config"
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
||||
db_user=$db_name
|
||||
|
@ -72,7 +71,7 @@ fi
|
|||
#=================================================
|
||||
# MODIFY URL IN NGINX CONF
|
||||
#=================================================
|
||||
ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
|
||||
ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
|
||||
|
||||
nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
|
|||
#=================================================
|
||||
# RESTORE THE APP MAIN DIR
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring YOURLS main directory..." --weight=3
|
||||
ynh_script_progression --message="Restoring the app main directory..." --weight=3
|
||||
|
||||
ynh_restore_file --origin_path="$final_path"
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ upgrade_type=$(ynh_check_app_version_changed)
|
|||
#=================================================
|
||||
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up YOURLS before upgrading (may take a while)..." --weight=1
|
||||
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
|
||||
|
||||
# Backup the current version of the app
|
||||
ynh_backup_before_upgrade
|
||||
|
@ -47,6 +47,7 @@ ynh_abort_if_errors
|
|||
#=================================================
|
||||
# ENSURE DOWNWARD COMPATIBILITY
|
||||
#=================================================
|
||||
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
|
||||
|
||||
# If db_name doesn't exist, create it
|
||||
if [ -z "$db_name" ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue