From cf6e207dde5d9e996b2cb620786dfdeed142dd81 Mon Sep 17 00:00:00 2001
From: anmol26s <github@datamol.org>
Date: Fri, 14 Sep 2018 09:05:17 +0530
Subject: [PATCH] Folder name from squid to squid3

---
 scripts/backup  | 2 +-
 scripts/install | 8 ++++----
 scripts/restore | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index cb26f19..dbf9b98 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -31,4 +31,4 @@ app=$YNH_APP_INSTANCE_NAME
 # BACKUP OF THE CONFIG OF SQUID3
 #=================================================
 
-ynh_backup "/etc/squid/squid.conf"
+ynh_backup "/etc/squid3/squid.conf"
diff --git a/scripts/install b/scripts/install
index 1926e82..2d46075 100755
--- a/scripts/install
+++ b/scripts/install
@@ -86,7 +86,7 @@ ynh_install_app_dependencies squid3
 
 ynh_replace_string "__ADMIN_PASS__" "$admin_pass_yuno" "../conf/squid.conf"
 ynh_replace_string "__PORT__"       "$port"            "../conf/squid.conf"
-cp -f "../conf/squid.conf" "/etc/squid/."
+cp -f "../conf/squid.conf" "/etc/squid3/."
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
 #=================================================
@@ -96,7 +96,7 @@ cp -f "../conf/squid.conf" "/etc/squid/."
 ### you can make a backup of this file before modifying it again if the admin had modified it.
 
 # Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum "/etc/squid/squid.conf"
+ynh_store_file_checksum "/etc/squid3/squid.conf"
 
 
 #=================================================
@@ -118,14 +118,14 @@ yunohost service add squid  --log "/var/log/squid/access.log"
 # RESTART SQUID'S SERVICE
 #=================================================
 
-ynh_system_reload --service_name=squid --action=restart
+ynh_system_reload --service_name=squid3 --action=restart
 
 
 #=================================================
 # SEND A README FOR THE ADMIN
 #=================================================
 
-message="You can find a config file at /etc/squid/squid.conf
+message="You can find a config file at /etc/squid3/squid.conf
 Squid 3 will work with your registered users. Just put the username and password when asked.
 
 To configure on Firefox go to preferences->general->network proxy->manual proxy configuration.
diff --git a/scripts/restore b/scripts/restore
index 25c10eb..80256aa 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -47,8 +47,8 @@ yunohost firewall allow --no-upnp TCP $port
 #=================================================
 # RESTORE INOTIFY'S CONFIG
 #=================================================
-ynh_secure_remove "/etc/squid/squid.conf"	
-ynh_restore_file  "/etc/squid/squid.conf"
+ynh_secure_remove "/etc/squid3/squid.conf"	
+ynh_restore_file  "/etc/squid3/squid.conf"
 ynh_system_reload --service_name=squid --action=restart
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
@@ -61,7 +61,7 @@ yunohost service add squid  --log "/var/log/squid/access.log"
 # SEND A README FOR THE ADMIN
 #=================================================
 
-message="You can find a config file at /etc/squid/squid.conf
+message="You can find a config file at /etc/squid3/squid.conf
 Squid 3 will work with your registered users. Just put the username and password when asked.
 
 To configure on Firefox go to preferences->general->network proxy->manual proxy configuration.