correction de conflict

tags/0.1.0
Daniel Berteaud 13 years ago
commit 5c77b97fd2
  1. 174
      CHANGELOG
  2. 1
      root/home/e-smith/files/shares/wpkg/files/profiles.xml

@ -1,174 +0,0 @@
commit 8e3e04e190ebc2e4505b5ceba755da3e84e0afff
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon May 21 17:39:40 2012 +0200
replace wpkg-gp with a custom wpkg script
commit 3423b80e17bb96174f3bccb5d3a83b2eabbcda42
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 20 19:02:33 2012 +0200
update spec file
commit 24f690b3c461047676f5b73db1e381b5dbfaeaec
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 20 19:02:15 2012 +0200
iPasserelle ASCII art in wpkg.bat
commit 1dffffee510fbe8a28340209d608f18fc26649ae
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 20 18:45:54 2012 +0200
install wpkg instead of wpkg-gp in bootstrap
commit 3a36c8ef121ba7b91c9581e280e7179d172e0f87
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 20 18:45:08 2012 +0200
nonotify in bootstrap and check server connectivity
commit ab999f08f1c6694eec9307e3f907554359144e26
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 18 16:25:47 2012 +0200
Fix wpkg.bat templates
commit 16042ec8b44346d66ae0cbdfc4a52df7339185e7
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 18 16:00:45 2012 +0200
script for running wpkg on shutdown
commit 45a4e6f8766c8aa417b30595daa59f432c1f90d4
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 12 10:39:45 2012 +0200
add manual wpkg.bat script
commit 0357852bd4cc38213794a7b04e9ecf25e734031e
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 12 09:47:33 2012 +0200
Fix manual wpkg.bat script
commit 62122148fd7859e2acd70c24a79069849d1ad869
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 6 18:55:50 2012 +0200
Force 8 chars long passwords for VNC
commit b0c1b75553fda0a315887a87f1be0b772d144047
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 6 18:32:10 2012 +0200
templates for TightVNC reg files
commit e8b822a37fd6eea57425ff07b8af5354b340335a
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 6 11:12:39 2012 +0200
Change TighVNC password
commit c49d6aadd7f28cf24be01ab03b1780b55a2e2f42
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Apr 6 10:59:49 2012 +0200
Handle deploiement password change
commit 00ff1c53a66ff63cd580ba44ac19d2cb5737d020
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 5 18:44:12 2012 +0200
don't deploy libreoffice in the default profile
commit 1f14c17c962f74c9556e2f22d57ae347750127a6
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 5 18:37:41 2012 +0200
reset wpkg share ACL after packages update
commit 916e2f6b2651fa621e2799818dc156d4ffd67522
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 5 18:11:29 2012 +0200
create fusioninventory settings directory
commit fb376e266610260d14c7e2b1173caa52ff006db6
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 5 16:26:48 2012 +0200
change default param in profiles.xml
commit 4784eb5f12ec437f87f9434a28ef068707f85dca
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 5 16:11:06 2012 +0200
add fusioninventory agent dependency
commit d18727ef00d8c304567280522e1149dbd0b81342
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 5 15:29:50 2012 +0200
fix fusion inventory reg templates
commit 33f506d025d5309c987e0a8fd84737a47ee7a535
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu Apr 5 13:04:25 2012 +0200
Allow passwordless rsync and no auto updates of packages
commit b5a2fcbc5b676777f93921c0903606929bc2c9a5
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 4 17:54:56 2012 +0200
fix update script
commit 58bed7335dec44f8ed331d66f9c15808a15204eb
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 4 17:41:18 2012 +0200
add fusioninventory agent support
commit 98e4d1b7605e72ec5a8918d5b37e3bac72209775
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 4 15:26:10 2012 +0200
force install on bootstrap
commit 34f53b2c966ade7d7292b7eb977111f48864c849
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 4 14:49:08 2012 +0200
Fix WPKG ini
commit 4954abafaec483561cea6adc755f20f755bc62cc
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 4 11:05:18 2012 +0200
fix config.xml templates
commit 575fa80e096bd6bcf7d648d9adaaf497454b1442
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed Apr 4 10:12:12 2012 +0200
add WPKGLOGS variable
commit 8cd51d61922eadaca6b3f94534db24e16f0aa818
Merge: 17c79f2 b21a073
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun Mar 18 18:03:41 2012 +0100
Fix merge
commit 17c79f21d5168219846b973973d423911c91eca6
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Mar 16 18:09:46 2012 +0100
Initial commit
commit b21a07303456520b37b5e253bd583361522215b3
Author: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri Mar 16 18:09:46 2012 +0100
Initial commit

@ -35,6 +35,7 @@
<variable name="IPASSERELLE_NT_DOMAIN" value="__NT_DOMAIN__" /> <variable name="IPASSERELLE_NT_DOMAIN" value="__NT_DOMAIN__" />
<variable name="IPASSERELLE_NAME" value="__NETBIOS_NAME__" /> <variable name="IPASSERELLE_NAME" value="__NETBIOS_NAME__" />
<variable name="IPASSERELLE_IP" value="__IP_ADDRESS__" /> <variable name="IPASSERELLE_IP" value="__IP_ADDRESS__" />
<variable name="BACKUP_SERVER_IP" value="__IP_ADDRESS__" />
<variable name="IPASSERELLE_HOME_URL" value="http://auth.%IPASSERELLE_DOMAIN%" /> <variable name="IPASSERELLE_HOME_URL" value="http://auth.%IPASSERELLE_DOMAIN%" />
<variable name="TOOLS" value="\\%IPASSERELLE_IP%\tools" /> <variable name="TOOLS" value="\\%IPASSERELLE_IP%\tools" />
<variable name="WPKGLOGS" value="\\%IPASSERELLE_IP%\wpkglogs" /> <variable name="WPKGLOGS" value="\\%IPASSERELLE_IP%\wpkglogs" />

Loading…
Cancel
Save