/mandos/trunk : revision 423

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

Committer: Teddy Hogeborn
Date: 2010-09-12 03:00:40 UTC
Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh

Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

files removed:
mandos-monitor.xml

files modified:
Makefile

TODO

debian/watch

mandos

mandos-ctl

mandos-keygen

mandos-monitor

mandos.lsm

plugins.d/mandos-client.c

plugins.d/plymouth.c

plugins.d/usplash.c

Show diffs side-by-side

added added

removed removed

Makefile

--expression='s/$<a class="citerefentry" href="$$"><span class="citerefentry"><span class="refentrytitle">$$[^<]*$$<\/span>($$[^)]*$$)<\/span><\/a>$/\1\3.\5\2\3\4\5\6/g'

PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \

plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \

plugins.d/plymouth

plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo

CPROGS=plugin-runner $(PLUGINS)

PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)

PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)

DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \

mandos-monitor.8 \

plugins.d/mandos-client.8mandos \

plugins.d/password-prompt.8mandos mandos.conf.5 \

plugins.d/usplash.8mandos plugins.d/splashy.8mandos \

133

131

legalnotice.xml

134

132

$(DOCBOOKTOHTML)

135

133

136

mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \

137

legalnotice.xml

138

$(DOCBOOKTOMAN)

139

mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \

140

legalnotice.xml

141

$(DOCBOOKTOHTML)

142

143

134

mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \

144

135

legalnotice.xml

145

136

$(DOCBOOKTOMAN)

186

177

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

187

178

$@)

188

179

189

mandos-monitor: Makefile

190

$(strip $(SED) --in-place \

191

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

192

$@)

193

194

180

mandos.lsm: Makefile

195

181

$(strip $(SED) --in-place \

196

182

--expression='s/^$Version:$.*/\1\t$(version)/' \

247

233

# Run the server with a local config

248

234

run-server: confdir/mandos.conf confdir/clients.conf

249

235

@echo "#################################################################"

250

@echo "# NOTE: Please IGNORE the error about \"Could not open file #"

251

@echo "# u'/var/run/mandos.pid'\" - it is harmless and is caused by #"

252

@echo "# the server not running as root. Do NOT run \"make run-server\" #"

253

@echo "# server as root if you didn't also unpack and compile it thus. #"

236

@echo "# NOTE: Please IGNORE errors about \"No permission to bind to #"

237

@echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" - #"

238

@echo "# they are harmless and are caused by the server not running as #"

239

@echo "# root. Do NOT run \"make run-server\" server as root if you did #"

240

@echo "# not also unpack and compile it as root. #"

254

241

@echo "#################################################################"

255

242

./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)

256

243

274

261

install-server: doc

275

262

install --directory $(CONFDIR)

276

263

install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos

277

install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \

278

mandos-ctl

279

install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \

280

mandos-monitor

281

264

install --mode=u=rw,go=r --target-directory=$(CONFDIR) \

282

265

mandos.conf

283

266

install --mode=u=rw --target-directory=$(CONFDIR) \

284

267

clients.conf

285

install --mode=u=rw,go=r dbus-mandos.conf \

286

$(DESTDIR)/etc/dbus-1/system.d/mandos.conf

287

268

install --mode=u=rwx,go=rx init.d-mandos \

288

269

$(DESTDIR)/etc/init.d/mandos

289

270

install --mode=u=rw,go=r default-mandos \

325

306

install --mode=u=rwxs,go=rx \

326

307

--target-directory=$(PREFIX)/lib/mandos/plugins.d \

327

308

plugins.d/askpass-fifo

328

install --mode=u=rwxs,go=rx \

329

--target-directory=$(PREFIX)/lib/mandos/plugins.d \

330

plugins.d/plymouth

331

309

install initramfs-tools-hook \

332

310

$(INITRAMFSTOOLS)/hooks/mandos

333

311

install --mode=u=rw,go=r initramfs-tools-hook-conf \

360

338

361

339

uninstall-server:

362

340

-rm --force $(PREFIX)/sbin/mandos \

363

$(PREFIX)/sbin/mandos-ctl \

364

$(PREFIX)/sbin/mandos-monitor \

365

341

$(MANDIR)/man8/mandos.8.gz \

366

342

$(MANDIR)/man5/mandos.conf.5.gz \

367

343

$(MANDIR)/man5/mandos-clients.conf.5.gz

380

356

$(PREFIX)/lib/mandos/plugins.d/usplash \

381

357

$(PREFIX)/lib/mandos/plugins.d/splashy \

382

358

$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \

383

$(PREFIX)/lib/mandos/plugins.d/plymouth \

384

359

$(INITRAMFSTOOLS)/hooks/mandos \

385

360

$(INITRAMFSTOOLS)/conf-hooks.d/mandos \

386

361

$(INITRAMFSTOOLS)/scripts/init-premount/mandos \

399

374

400

375

purge-server: uninstall-server

401

376

-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \

402

$(DESTDIR)/etc/dbus-1/system.d/mandos.conf

403

377

$(DESTDIR)/etc/default/mandos \

404

378

$(DESTDIR)/etc/init.d/mandos \

405

379

$(DESTDIR)/var/run/mandos.pid

Older »