go-opsi/windows.domainjoin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added local admin pw property, translation comments/properties

Browse Source
This commit is contained in:
Dennis Trinks 2012-04-12 20:37:44 +02:00
parent 38fcc613a9
commit 6ee9955d45
3 changed files with 23 additions and 11 deletions

11
CLIENT_DATA/setup32.ins

@ -6,9 +6,10 @@
[Actions] [Actions]
requiredWinstVersion >= "4.10.8.6" requiredWinstVersion >= "4.10.8.6"
DefVar $namedomaene$ DefVar $domainname$
DefVar $joinadmin$ DefVar $joinadmin$
DefVar $joinadminpw$ DefVar $joinadminpw$
DefVar $localadminpw$
DefVar $joinstr$ DefVar $joinstr$
DefVar $MsiId$ DefVar $MsiId$
DefVar $UninstallProgram$ DefVar $UninstallProgram$
@ -22,10 +23,11 @@ DefVar $LicenseKey$
DefVar $LicensePool$ DefVar $LicensePool$
Set $LogDir$ = "%SystemDrive%\tmp" Set $LogDir$ = "%SystemDrive%\tmp"
Set $namedomaene$ = GetProductProperty ("namedomaene","values") Set $domainname$ = GetProductProperty ("domainname","values")
Set $joinadmin$ = GetProductProperty ("joinadmin","values") Set $joinadmin$ = GetProductProperty ("joinadmin","values")
Set $joinadminpw$ = GetProductProperty ("joinadminpw","values") Set $joinadminpw$ = GetProductProperty ("joinadminpw","values")
Set $joinstr$ = "JOIN %PCName% /Domain:" + $namedomaene$ + " /UserD:" + $joinadmin$ + " /PasswordD:" + $joinadminpw$ Set $joinstr$ = "JOIN %PCName% /Domain:" + $domainname$ + " /UserD:" + $joinadmin$ + " /PasswordD:" + $joinadminpw$
Set $localadminpw$ = GetProductProperty ("localadminpw","values")
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
; and adds the following variables: ; and adds the following variables:
@ -85,7 +87,7 @@ else
endif endif
[Files_install] [Files_install]
copy "%ScriptPath%\netdom.exe" %System% copy "%ScriptPath%\custom\netdom.exe" %System%
[Winbatch_install] [Winbatch_install]
; Choose one of the following examples as basis for your installation ; Choose one of the following examples as basis for your installation
@ -93,5 +95,6 @@ copy "%ScriptPath%\netdom.exe" %System%
; ;
; === Nullsoft Scriptable Install System ================================================================ ; === Nullsoft Scriptable Install System ================================================================
net user Administrator $localadminpw$
netdom.exe $joinstr$ netdom.exe $joinstr$

21
OPSI/control

@ -7,7 +7,7 @@ incremental: False
type: localboot type: localboot
id: windows-domainjoin id: windows-domainjoin
name: windows-domainjoin name: windows-domainjoin
description: Paket um PC in Domaene aufzunehmen description: Package for domainjoin and setting local adminpassword
advice: ADVICE advice: ADVICE
version: VERSION version: VERSION
priority: PRIORITY priority: PRIORITY
@ -32,10 +32,10 @@ userLoginScript:
[ProductProperty] [ProductProperty]
type: unicode type: unicode
name: namedomaene name: domainname
multivalue: False multivalue: False
editable: True editable: True
description: Name der Domaene der PC beitreten soll description: Domain PC joins
values: [""] values: [""]
default: ["DomainName"] default: ["DomainName"]
@ -44,7 +44,7 @@ type: unicode
name: joinadmin name: joinadmin
multivalue: False multivalue: False
editable: True editable: True
description: Accountname mit Berechtigung PC in Domaene aufzunehmen description: Accountname privileged for domainjoin
values: [""] values: [""]
default: ["JoinAdmin"] default: ["JoinAdmin"]
@ -53,6 +53,15 @@ type: unicode
name: joinadminpw name: joinadminpw
multivalue: False multivalue: False
editable: True editable: True
description: Passwort Accountname mit Berechtigung PC in Domaene aufzunehmen description: Password for privileged account
values: [""] values: [""]
default: ["JoinAdminPW"] default: ["JoinAdminPW"]
[ProductProperty]
type: unicode
name: localadminpw
multivalue: False
editable: True
description: Local Administrator password
values: [""]
default: [""]

2
builder-product.cfg

@ -6,7 +6,7 @@ PN="windows-domainjoin"
VERSION="1" VERSION="1"
RELEASE="1" RELEASE="1"
PRIORITY="0" PRIORITY="0"
ADVICE="Pflichtfelder: Name Domaene / Join Admin / Join Admin PW" ADVICE="Mandatory items: domainname / joinadmin / joinadminpw / localadminpw"
# TYPE - defines, if the install files are public or restricted. # TYPE - defines, if the install files are public or restricted.
# Valid value: restricted | public # Valid value: restricted | public