diff -ur nuface-1.2.5.orig/aclajax.php nuface-1.2.5/aclajax.php
--- nuface-1.2.5.orig/aclajax.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/aclajax.php 2007-09-04 18:23:33.000000000 +0800
@@ -2,7 +2,7 @@
session_start();
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/messages.php");
#require_once ("include/headers.php");
require_once ("include/function.php");
diff -ur nuface-1.2.5.orig/acls.php nuface-1.2.5/acls.php
--- nuface-1.2.5.orig/acls.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/acls.php 2007-09-04 18:17:55.000000000 +0800
@@ -25,7 +25,7 @@
$title='acls';
$singtitle='acl';
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/messages.php");
$header_onclick="return ask_list_change(new Array('sortcat'),'$gal_confirm_change_order')";
require_once ("include/headers.php");
diff -ur nuface-1.2.5.orig/applications.php nuface-1.2.5/applications.php
--- nuface-1.2.5.orig/applications.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/applications.php 2007-09-04 18:18:14.000000000 +0800
@@ -25,7 +25,7 @@
$title="applications";
$singtitle="application";
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/headers.php");
require_once ("include/function.php");
require_once ("include/types.php");
diff -ur nuface-1.2.5.orig/floatings.php nuface-1.2.5/floatings.php
--- nuface-1.2.5.orig/floatings.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/floatings.php 2007-09-04 18:18:27.000000000 +0800
@@ -4,7 +4,7 @@
$title='floatings';
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/headers.php");
require_once ("include/function.php");
require_once ("include/types.php");
diff -ur nuface-1.2.5.orig/include/config.template.php nuface-1.2.5/include/config.template.php
--- nuface-1.2.5.orig/include/config.template.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/include/config.template.php 2007-09-04 18:21:34.000000000 +0800
@@ -23,7 +23,7 @@
#if set to "true", user of the interface will be provided a way to change language on the fly
$lang_override=true;
#[default] language of the interface
-$lang='fr';
+$lang='en';
#if one adds languages in messages.php, also add it to this array
$available_langs=array('fr','en');
@@ -80,24 +80,23 @@
# Display image as logo
$logo_nuface = "images/nupik.gif";
-$datadir="/var/local/nuface";
-#$datadir="/tmp/";
-#$logdir="/var/local/nuface-logs";
-$lockdir="/tmp";
+$datadir="/var/lib/nuface";
+$logdir="/var/log/nuface";
+$lockdir="/var/lib/nuface";
$tmpdir="/tmp";
-$rules_dir="/etc/network/firewall/dyn";
-$nufw_rules_dir="/etc/network/firewall/dyn/nufw";
-$std_rules_dir="/etc/network/firewall/dyn/standard";
+$rules_dir="/etc/nuface/dyn";
+$nufw_rules_dir="/etc/nuface/dyn/nufw";
+$std_rules_dir="/etc/nuface/dyn/standard";
$nufw_rules_file="fwd_rules";
$std_rules_file="nonufw_rules";
$nupyf_ldap_file="ldap_objects";
$nupyf_conf_file="nupyf.conf";
-$network_desc_dir="/etc/network/firewall/desc";
+$network_desc_dir="/etc/nuface/desc";
$network_desc_file="desc.xml";
#$network_desc_file=array("desc.xml","desc2.xml");
@@ -106,8 +105,8 @@
$nuperiod_command="/usr/sbin/nuperiod";
$sudo_command="/usr/bin/sudo";
-$network_script_dir="/etc/network/firewall";
-$firewall_script="/etc/init.d/init-firewall";
+$network_script_dir="/etc/nuface";
+$firewall_script="/etc/rc.d/init.d/nupyf";
## Begin of duplication section ##
# These settings are experimental.
diff -ur nuface-1.2.5.orig/include/headers.php nuface-1.2.5/include/headers.php
--- nuface-1.2.5.orig/include/headers.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/include/headers.php 2007-09-04 18:21:58.000000000 +0800
@@ -80,7 +80,7 @@
</head>
<body>
<?php
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/messages.php");
if ($edenwall_integration!=0)
require_once ('../nuconf/include/edennavbar.php');
diff -ur nuface-1.2.5.orig/index.php nuface-1.2.5/index.php
--- nuface-1.2.5.orig/index.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/index.php 2007-09-04 18:22:11.000000000 +0800
@@ -22,7 +22,7 @@
session_start();
require_once ("include/function.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/messages.php");
$title='index';
diff -ur nuface-1.2.5.orig/l7rules.php nuface-1.2.5/l7rules.php
--- nuface-1.2.5.orig/l7rules.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/l7rules.php 2007-09-04 18:23:58.000000000 +0800
@@ -24,7 +24,7 @@
$title="l7rules";
$singtitle="l7rule";
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/headers.php");
require_once ("include/function.php");
require_once ("include/types.php");
diff -ur nuface-1.2.5.orig/nat.php nuface-1.2.5/nat.php
--- nuface-1.2.5.orig/nat.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/nat.php 2007-09-04 18:22:25.000000000 +0800
@@ -24,7 +24,7 @@
$title='nat';
$singtitle='nat';
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/messages.php");
$header_onclick = "return ask_list_change(new Array('sortsnat','sortdnat','sortpnat'),'$gal_confirm_change_order')";
require_once ("include/headers.php");
diff -ur nuface-1.2.5.orig/periods.php nuface-1.2.5/periods.php
--- nuface-1.2.5.orig/periods.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/periods.php 2007-09-04 18:23:47.000000000 +0800
@@ -23,7 +23,7 @@
session_start();
$title="periods";
$singtitle="period";
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/headers.php");
require_once ("include/function.php");
require_once ("include/types.php");
diff -ur nuface-1.2.5.orig/protocols.php nuface-1.2.5/protocols.php
--- nuface-1.2.5.orig/protocols.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/protocols.php 2007-09-04 18:22:37.000000000 +0800
@@ -24,7 +24,7 @@
$title="protocols";
$singtitle="protocol";
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/headers.php");
require_once ("include/function.php");
require_once ("include/types.php");
diff -ur nuface-1.2.5.orig/ressources.php nuface-1.2.5/ressources.php
--- nuface-1.2.5.orig/ressources.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/ressources.php 2007-09-04 18:22:50.000000000 +0800
@@ -23,7 +23,7 @@
$title="ressources";
$singtitle="ressource";
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/headers.php");
require_once ("include/function.php");
require_once ("include/types.php");
diff -ur nuface-1.2.5.orig/subjects.php nuface-1.2.5/subjects.php
--- nuface-1.2.5.orig/subjects.php 2007-09-04 18:16:58.000000000 +0800
+++ nuface-1.2.5/subjects.php 2007-09-04 18:23:04.000000000 +0800
@@ -25,7 +25,7 @@
$title="subjects";
$singtitle="subject";
require_once ("include/security.php");
-require_once ("include/config.php");
+require_once ("/etc/nuface/config.php");
require_once ("include/headers.php");
require_once ("include/function.php");
require_once ("include/types.php");
