diff --git a/README.md b/README.md
index bac5678..5cbc85f 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
It shall NOT be edited by hand.
-->
-# ifconfig.io for YunoHost
+# ifconfig-io for YunoHost
-[](https://dash.yunohost.org/appci/app/ifconfig-io)  
-[](https://install-app.yunohost.org/?app=ifconfig-io)
+[](https://dash.yunohost.org/appci/app/ifconfig-io)  
+[](https://install-app.yunohost.org/?app=ifconfig-io)
*[Lire ce readme en français.](./README_fr.md)*
-> *This package allows you to install ifconfig.io quickly and simply on a YunoHost server.
+> *This package allows you to install ifconfig-io quickly and simply on a YunoHost server.
If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
## Overview
@@ -22,28 +22,28 @@ I used the gin framework as it does several things to ensure that there are no m
Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.
-**Shipped version:** 2021.02.16~ynh2
+**Shipped version:** 2022.01.05~ynh1
**Demo:** https://ifconfig.io
-
## Documentation and resources
-* Official app website: https://ifconfig.io/
-* Official user documentation: https://github.com/georgyo/ifconfig.io/
-* Official admin documentation: https://github.com/georgyo/ifconfig.io/
-* Upstream app code repository: https://github.com/georgyo/ifconfig.io/
-* YunoHost documentation for this app: https://yunohost.org/app_ifconfig-io
-* Report a bug: https://github.com/YunoHost-Apps/ifconfig-io_ynh/issues
+* Official app website:
+* Official user documentation:
+* Official admin documentation:
+* Upstream app code repository:
+* YunoHost documentation for this app:
+* Report a bug:
## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/ifconfig-io_ynh/tree/testing).
To try the testing branch, please proceed like that.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/ifconfig-io_ynh/tree/testing --debug
or
sudo yunohost app upgrade ifconfig-io -u https://github.com/YunoHost-Apps/ifconfig-io_ynh/tree/testing --debug
```
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**More info regarding app packaging:**
diff --git a/README_fr.md b/README_fr.md
index 2603fe2..77ca2db 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,12 +1,16 @@
-# ifconfig.io pour YunoHost
+
-[](https://dash.yunohost.org/appci/app/ifconfig-io)  
-[](https://install-app.yunohost.org/?app=ifconfig-io)
+# ifconfig-io pour YunoHost
+
+[](https://dash.yunohost.org/appci/app/ifconfig-io)  
+[](https://install-app.yunohost.org/?app=ifconfig-io)
*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
-> *Ce package vous permet d'installer ifconfig.io rapidement et simplement sur un serveur YunoHost.
+> *Ce package vous permet d'installer ifconfig-io rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
## Vue d'ensemble
@@ -18,28 +22,28 @@ I used the gin framework as it does several things to ensure that there are no m
Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.
-**Version incluse :** 2021.02.16~ynh2
+**Version incluse :** 2022.01.05~ynh1
**Démo :** https://ifconfig.io
-
## Documentations et ressources
-* Site officiel de l'app : https://ifconfig.io/
-* Documentation officielle utilisateur : https://github.com/georgyo/ifconfig.io/
-* Documentation officielle de l'admin : https://github.com/georgyo/ifconfig.io/
-* Dépôt de code officiel de l'app : https://github.com/georgyo/ifconfig.io/
-* Documentation YunoHost pour cette app : https://yunohost.org/app_ifconfig-io
-* Signaler un bug : https://github.com/YunoHost-Apps/ifconfig-io_ynh/issues
+* Site officiel de l'app :
+* Documentation officielle utilisateur :
+* Documentation officielle de l'admin :
+* Dépôt de code officiel de l'app :
+* Documentation YunoHost pour cette app :
+* Signaler un bug :
## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/ifconfig-io_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/ifconfig-io_ynh/tree/testing --debug
ou
sudo yunohost app upgrade ifconfig-io -u https://github.com/YunoHost-Apps/ifconfig-io_ynh/tree/testing --debug
```
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :**
diff --git a/check_process b/check_process
index 87fec39..6d333a9 100644
--- a/check_process
+++ b/check_process
@@ -13,7 +13,7 @@
setup_sub_dir=1
setup_root=1
setup_nourl=0
- setup_private=1
+ setup_private=0
setup_public=1
upgrade=1
# 2021.02.16~ynh1
diff --git a/conf/app.src b/conf/app.src
index 3cd9a3a..63863ce 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/georgyo/ifconfig.io/archive/45d46592cf1dd12f2163f2dfed617f6f9d75d637.tar.gz
-SOURCE_SUM=7559DA2F3BDF8EDFA8338786E985F785551AE70F860223CC2A587C447D558ADB
+SOURCE_URL=https://github.com/georgyo/ifconfig.io/archive/0395b2024d26ffa92cede56f456e4a784c45c4de.tar.gz
+SOURCE_SUM=8314375a4558d059eff6d45751c9b13429e720894a26b2b166ab0342489198e7
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/conf/systemd.service b/conf/systemd.service
index 7570de8..75e39f5 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,6 +9,7 @@ Group=__APP__
Environment=PORT=__PORT__
Environment=HOSTNAME=__DOMAIN__
Environment=GIN_MODE=release
+Environment=FORWARD_IP_HEADER=X-Forwarded-For
WorkingDirectory=__APP_PATH__/
ExecStart=__APP_PATH__/ifconfig.io
StandardOutput=append:/var/log/__APP__/__APP__.log
diff --git a/manifest.json b/manifest.json
index af83bad..ec64e2e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
"description": {
"en": "IP API service to get their public IP address."
},
- "version": "2021.02.16~ynh2",
+ "version": "2022.01.05~ynh1",
"url": "https://github.com/georgyo/ifconfig.io/",
"upstream": {
"license": "MIT",
@@ -38,11 +38,6 @@
"type": "path",
"example": "/example",
"default": "/example"
- },
- {
- "name": "is_public",
- "type": "boolean",
- "default": true
}
]
}
diff --git a/scripts/install b/scripts/install
index 51df507..3aef3df 100755
--- a/scripts/install
+++ b/scripts/install
@@ -25,7 +25,6 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
app=$YNH_APP_INSTANCE_NAME
#=================================================
@@ -101,9 +100,6 @@ ynh_add_nginx_config
#=================================================
ynh_script_progression --message="Installing..." --weight=5
-export GOPATH=$HOME/go
-export GO111MODULE=on
-
pushd "$app_path"
ynh_exec_warn_less go mod download
ynh_exec_warn_less go build
@@ -150,12 +146,9 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap
ynh_script_progression --message="Configuring permissions..." --weight=1
# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
- # Everyone can access the app.
- # The "main" permission is automatically created before the install script.
- ynh_permission_update --permission="main" --add="visitors"
-fi
+# Everyone can access the app.
+# The "main" permission is automatically created before the install script.
+ynh_permission_update --permission="main" --add="visitors"
#=================================================
# RELOAD NGINX
diff --git a/scripts/upgrade b/scripts/upgrade
index 0c0654d..d290ef2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -106,9 +106,6 @@ ynh_install_app_dependencies $pkg_dependencies
#=================================================
ynh_script_progression --message="Upgrading..." --weight=5
-export GOPATH=$HOME/go
-export GO111MODULE=on
-
pushd "$app_path"
ynh_exec_warn_less go mod download
ynh_exec_warn_less go build