privacyidea: Update, build changes
This commit is contained in:
Joerg Deckert
parent
206631b6e8
commit
d699aab38f
|
|
@ -28,8 +28,10 @@ postinstall: timesyncd.conf firstboot.start
|
|||
# Beispiel feste IP-Adresse
|
||||
cp 00-eth0.network $(CHROOT)/00-eth0.network.example
|
||||
|
||||
# MariaDB-Konfiguration
|
||||
cp mariadb/my.cnf $(CHROOT)/etc/mysql/my.cnf
|
||||
# MariaDB-Konfiguration ($$, weil make ein $ entfernt)
|
||||
sed -i "s/^character-set-server.*$$/character-set-server = utf8mb4\ncollation-server = utf8mb4_general_ci\ntransaction_isolation = READ-COMMITTED\nbinlog_format = ROW\nexpire_logs_days = 3/" $(CHROOT)/etc/mysql/my.cnf
|
||||
sed -i "s/^innodb_file_per_table.*$$/innodb_file_per_table=1\ninnodb_file_format=barracuda\ninnodb_large_prefix=on/" $(CHROOT)/etc/mysql/my.cnf
|
||||
sed -i "s/default-character-set=utf8/default-character-set=utf8mb4/" $(CHROOT)/etc/mysql/my.cnf
|
||||
cp mariadb/my.cnf.root $(CHROOT)/root/.my.cnf
|
||||
chmod 0600 $(CHROOT)/root/.my.cnf
|
||||
rm -rf $(CHROOT)/var/lib/mysql/*
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
root (hd0,0)
|
||||
setup (hd0)
|
||||
root (hd1,0)
|
||||
setup (hd1)
|
||||
quit
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
mount -t proc proc /mnt/gentoo/proc
|
||||
mount --rbind /sys /mnt/gentoo/sys
|
||||
mount --rbind /dev /mnt/gentoo/dev
|
||||
|
||||
chroot /mnt/gentoo cat /grub.shell | /sbin/grub --no-floppy --batch
|
||||
|
||||
umount /mnt/gentoo/proc
|
||||
umount /mnt/gentoo/sys
|
||||
umount /mnt/gentoo/dev
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.14.52-gentoo Kernel Configuration
|
||||
# Linux/x86 4.14.83-gentoo Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
|
|
@ -236,6 +236,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y
|
|||
CONFIG_SLUB_CPU_PARTIAL=y
|
||||
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
|
||||
# CONFIG_PROFILING is not set
|
||||
CONFIG_HOTPLUG_SMT=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_OPROFILE_NMI_TIMER=y
|
||||
CONFIG_JUMP_LABEL=y
|
||||
|
|
@ -268,6 +269,7 @@ CONFIG_HAVE_PERF_REGS=y
|
|||
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_HAVE_RCU_TABLE_FREE=y
|
||||
CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
|
||||
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
|
||||
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
|
||||
CONFIG_HAVE_CMPXCHG_LOCAL=y
|
||||
|
|
@ -2834,7 +2836,6 @@ CONFIG_CRYPTO_AES=y
|
|||
# CONFIG_CRYPTO_FCRYPT is not set
|
||||
# CONFIG_CRYPTO_KHAZAD is not set
|
||||
# CONFIG_CRYPTO_SALSA20 is not set
|
||||
# CONFIG_CRYPTO_SALSA20_X86_64 is not set
|
||||
# CONFIG_CRYPTO_CHACHA20 is not set
|
||||
# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
|
||||
# CONFIG_CRYPTO_SEED is not set
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ CFLAGS="-O2 -pipe"
|
|||
CXXFLAGS="-O2 -pipe"
|
||||
USE="hardened justify pie ssp urandom xattr -fortran -jit -orc -pch -pic -prelink -profile -tcc"
|
||||
MAKEOPTS="-j5"
|
||||
# privacyIDEA/wsgi braucht Python2.7, Python3.5 ist default im aktuellen stage3
|
||||
PYTHON_TARGETS="python2_7 python3_5"
|
||||
PYTHON_SINGLE_TARGET="python2_7"
|
||||
# privacyIDEA/wsgi braucht Python2.7, Python3.6 ist default im aktuellen stage3
|
||||
PYTHON_TARGETS="python2_7 python3_6"
|
||||
##PYTHON_SINGLE_TARGET="python2_7"
|
||||
VIDEO_CARDS="vmware"
|
||||
|
|
|
|||
|
|
@ -1,143 +0,0 @@
|
|||
# /etc/mysql/my.cnf: The global mysql configuration file.
|
||||
# $Id$
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = 3306
|
||||
socket = /var/run/mysqld/mysqld.sock
|
||||
|
||||
[mysql]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqladmin]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlcheck]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqldump]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlimport]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlshow]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[myisamchk]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
|
||||
[myisampack]
|
||||
character-sets-dir=/usr/share/mariadb/charsets
|
||||
|
||||
# use [safe_mysqld] with mysql-3
|
||||
[mysqld_safe]
|
||||
err-log = /var/log/mysql/mysql.err
|
||||
|
||||
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
|
||||
[mysqld]
|
||||
character-set-server = utf8
|
||||
user = mysql
|
||||
port = 3306
|
||||
socket = /var/run/mysqld/mysqld.sock
|
||||
pid-file = /var/run/mysqld/mysqld.pid
|
||||
log-error = /var/log/mysql/mysqld.err
|
||||
basedir = /usr
|
||||
datadir = /var/lib/mysql
|
||||
skip-external-locking
|
||||
key_buffer_size = 16M
|
||||
max_allowed_packet = 4M
|
||||
table_open_cache = 400
|
||||
sort_buffer_size = 512K
|
||||
net_buffer_length = 16K
|
||||
read_buffer_size = 256K
|
||||
read_rnd_buffer_size = 512K
|
||||
myisam_sort_buffer_size = 8M
|
||||
lc_messages_dir = /usr/share/mariadb
|
||||
#Set this to your desired error message language
|
||||
lc_messages = en_US
|
||||
|
||||
# security:
|
||||
# using "localhost" in connects uses sockets by default
|
||||
# skip-networking
|
||||
bind-address = 127.0.0.1
|
||||
|
||||
##log-bin
|
||||
server-id = 1
|
||||
|
||||
# point the following paths to different dedicated disks
|
||||
tmpdir = /tmp/
|
||||
#log-update = /path-to-dedicated-directory/hostname
|
||||
|
||||
# you need the debug USE flag enabled to use the following directives,
|
||||
# if needed, uncomment them, start the server and issue
|
||||
# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
|
||||
# this will show you *exactly* what's happening in your server ;)
|
||||
|
||||
#log = /tmp/mysqld.sql
|
||||
#gdb
|
||||
#debug = d:t:i:o,/tmp/mysqld.trace
|
||||
#one-thread
|
||||
|
||||
# the rest of the innodb config follows:
|
||||
# don't eat too much memory, we're trying to be safe on 64Mb boxes
|
||||
# you might want to bump this up a bit on boxes with more RAM
|
||||
innodb_buffer_pool_size = 128M
|
||||
#
|
||||
# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
|
||||
# and upstream wants things to be under /var/lib/mysql/, so that's the route
|
||||
# we have to take for the moment
|
||||
#innodb_data_home_dir = /var/lib/mysql/
|
||||
#innodb_log_arch_dir = /var/lib/mysql/
|
||||
#innodb_log_group_home_dir = /var/lib/mysql/
|
||||
# you may wish to change this size to be more suitable for your system
|
||||
# the max is there to avoid run-away growth on your machine
|
||||
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
|
||||
# we keep this at around 25% of of innodb_buffer_pool_size
|
||||
# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
|
||||
innodb_log_file_size = 48M
|
||||
# this is the default, increase it if you have very large transactions going on
|
||||
innodb_log_buffer_size = 8M
|
||||
# this is the default and won't hurt you
|
||||
# you shouldn't need to tweak it
|
||||
innodb_log_files_in_group=2
|
||||
# see the innodb config docs, the other options are not always safe
|
||||
innodb_flush_log_at_trx_commit = 1
|
||||
innodb_lock_wait_timeout = 50
|
||||
innodb_file_per_table
|
||||
|
||||
# Uncomment this to get FEDERATED engine support
|
||||
#plugin-load=federated=ha_federated.so
|
||||
loose-federated
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
max_allowed_packet = 16M
|
||||
|
||||
[mysql]
|
||||
# uncomment the next directive if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer_size = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer_size = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer_size = 2M
|
||||
write_buffer_size = 2M
|
||||
|
||||
[mysqlhotcopy]
|
||||
interactive-timeout
|
||||
|
||||
[mariadb]
|
||||
|
|
@ -1,11 +1,7 @@
|
|||
# base (xml-security-c for open-vm-tools)
|
||||
# Grundsystem
|
||||
app-emulation/open-vm-tools ~amd64 ~x86
|
||||
dev-libs/xml-security-c ~amd64 ~x86
|
||||
sys-auth/pam_ssh_agent_auth ~amd64 ~x86
|
||||
|
||||
###MariaDB mit SystemD-Support
|
||||
##dev-db/mariadb ~amd64 ~x86
|
||||
|
||||
# privacyIDEA
|
||||
dev-python/responses
|
||||
dev-python/pyusb
|
||||
|
|
@ -21,6 +17,3 @@ dev-python/pytest-cov
|
|||
|
||||
# grunt, wird nur zur privacyIDEA-Translation benötigt
|
||||
dev-nodejs/*
|
||||
|
||||
### FreeRADIUS mit systemd-Support
|
||||
##net-dialup/freeradius
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ dev-lang/python ssl threads xml
|
|||
dev-libs/libpcre cxx jit
|
||||
dev-libs/libpcre2 jit
|
||||
dev-util/pkgconfig internal-glib
|
||||
dev-vcs/git -python
|
||||
net-misc/openssh ssl
|
||||
net-misc/wget ssl
|
||||
sys-apps/hwids udev
|
||||
|
|
@ -16,20 +17,19 @@ sys-apps/portage ipc
|
|||
sys-auth/pambase nullok sha512
|
||||
sys-devel/gcc cxx nptl
|
||||
sys-kernel/gentoo-sources symlink
|
||||
x11-libs/libdrm video_cards_vmware
|
||||
|
||||
# Monitoring
|
||||
net-analyzer/zabbix agent
|
||||
|
||||
# privacyIDEA
|
||||
www-apps/privacyidea -translation
|
||||
dev-lang/python
|
||||
www-apps/privacyidea -translation PYTHON_SINGLE_TARGET: -* python2_7
|
||||
dev-python/sqlalchemy -sqlite
|
||||
dev-python/netaddr -cli
|
||||
dev-python/numpy lapack
|
||||
dev-libs/c-blosc hdf5
|
||||
sys-devel/gcc fortran
|
||||
sci-libs/hdf5 -cxx -fortran -hl
|
||||
www-apache/mod_wsgi PYTHON_SINGLE_TARGET: -* python2_7
|
||||
|
||||
# RADIUS
|
||||
net-dialup/freeradius kerberos ldap mysql python
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
##HOSTNAME = $(APPLIANCE)
|
||||
##TIMEZONE = UTC
|
||||
##DISK_SIZE = 6.0G
|
||||
DISK_SIZE = 8.0G
|
||||
##SWAP_SIZE = 30
|
||||
##SWAP_FILE = $(CHROOT)/.swap
|
||||
##ARCH = amd64-hardened
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ app-misc/mc
|
|||
app-misc/screenservice
|
||||
net-analyzer/zabbix
|
||||
sys-auth/pam_ssh_agent_auth
|
||||
sys-fs/mdadm
|
||||
sys-power/acpid
|
||||
dev-db/mariadb
|
||||
www-apps/privacyidea
|
||||
|
|
|
|||
Reference in New Issue