blob: 41e80ea010e921953a46619cc06631df56294a05 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
#!/bin/bash
#
# jail-commit: update config files from a jail to a template
# feedback: rhatto@riseup.net | gpl
#
# Jail-commit is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or any later version.
#
# Jail-commit is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place - Suite 330, Boston, MA 02111-1307, USA
#
COMMON="/usr/libexec/simplepkg/common.sh"
BASENAME="`basename $0`"
if [ -f "$COMMON" ]; then
source $COMMON
eval_config $BASENAME
else
echo "error: file $COMMON found, check your $BASENAME installation"
exit 1
fi
function usage {
echo $BASENAME: commit a jail configuration into a template
echo "usage: \"$BASENAME [<jail-path> [template]]\""
echo " \"$BASENAME --all\" to commit all templates"
echo " \"$BASENAME --help\" for help"
}
function template_merge {
# copy differences between the jail
# and the template in the template folder
# usage: template_merge <jail-path>
if [ -z "$1" ] || [ ! -d "$TEMPLATE_BASE.d" ]; then
return 1
fi
echo "" > $TEMPLATE_BASE.perms.tmp
cd $TEMPLATE_BASE.d
for file in `find | grep -v -e "/.svn$" | grep -v -e "/.svn/" | grep -v -e "^\.$"`; do
if [[ -e "$file" && -e "$1/$file" ]]; then
if [ ! -d "$file" ] && [ ! -h "$file" ]; then
if ! diff -u $file $1/$file; then
echo Updating $file
cp -af $1/$file $file
fi
elif [ -h "$file" ]; then
if [ "`readlink $file`" != "`readlink $1/$file`" ]; then
rm -f $file
ln -s `readlink $1/$file` $file
fi
fi
perms="`numeric_perm $1/$file`"
owner="`get_owner $1/$file`"
group="`get_group $1/$file`"
# secure the file
chown root.root $TEMPLATE_BASE.d/$file
chmod $perms $TEMPLATE_BASE.d/$file
echo "$file;$owner;$group;$perms" >> $TEMPLATE_BASE.perms.tmp
else
if [ ! -e "$1/$file" ]; then
echo $BASENAME: warning: missing file `slash $1/$file`
fi
fi
done
cat $TEMPLATE_BASE.perms.tmp | sed '/^$/d' > $TEMPLATE_BASE.perms
rm -f $TEMPLATE_BASE.perms.tmp
if ! svn_check $TEMPLATE_BASE,perms; then
svn add $TEMPLATE_BASE,perms
fi
}
function template_svn_commit {
# issue a svn_commit from a template folder
# usage: template_svn_commit <template-folder>
if use_svn && [ -d "$1/.svn" ]; then
cd $1
echo First checking out from the repository...
svn update
echo Commiting changes to the repository...
svn commit -m "changes for `date`"
if [ "$?" != "0" ]; then
echo $BASENAME: commit error
fi
fi
}
function do_commit {
# commit jail changes to a repository
# usage: do_commit <jailpath> [template]
local jailpath template
jailpath="$1"
jail="`basename $jailpath`"
if [ ! -z "$2" ]; then
template="$2"
else
template="$jail"
fi
search_template $template --update
if [ "$?" == "0" ] && ! echo "$TEMPLATE_UPDATE_LIST" | grep -q " `basename $TEMPLATE_BASE` "; then
TEMPLATE_UPDATE_LIST=" $TEMPLATE_UPDATE_LIST `basename $TEMPLATE_BASE` " # the spaces are important
if [ "$jailpath" == "/" ]; then
echo Updating main installation...
else
echo Updating $jailpath...
fi
if [ -d "$TEMPLATE_BASE.d" ] || [ -a "$TEMPLATE_BASE.template" ]; then
SILENT=yes templatepkg -u $template $jailpath
template_merge $jailpath
fi
else
if [ -z "$SILENT" ]; then
echo $BASENAME: template $template not found
fi
return 1
fi
}
TEMPLATE_UPDATE_LIST=""
if [ "$1" == "--help" ]; then
usage
elif [ "$1" == "--all" ]; then
template_svn_commit $BASE_CONF/templates
elif echo $1 | grep -q -e "^--"; then
usage
elif [ ! -z "$1" ]; then
do_commit $1 $2
if [ "$?" == "0" ]; then
template_svn_commit `dirname $TEMPLATE_BASE`
fi
else
SILENT="yes"
if [ -e $JAIL_LIST ]; then
for jailpath in `cat $JAIL_LIST`; do
do_commit $jailpath
done
fi
# main jail
do_commit / main
template_svn_commit $BASE_CONF/templates
fi
|
