Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ansible-warpzone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
specki
ansible-warpzone
Commits
0a9b5271
Commit
0a9b5271
authored
4 years ago
by
Jens Sandmann
Browse files
Options
Downloads
Patches
Plain Diff
formating, remove etherpad, set python3 as ansible interpreter
parent
f988f73d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ansible.cfg
+1
-0
1 addition, 0 deletions
ansible.cfg
site.yml
+8
-9
8 additions, 9 deletions
site.yml
webserver/docker_dokuwiki/templates/Dockerfile
+1
-4
1 addition, 4 deletions
webserver/docker_dokuwiki/templates/Dockerfile
with
10 additions
and
13 deletions
ansible.cfg
+
1
−
0
View file @
0a9b5271
[defaults]
[defaults]
# some
default values for ansible
# some
default values for ansible
inventory
= hosts
inventory
= hosts
inter
preter_python = /usr/bin/python3
This diff is collapsed.
Click to expand it.
site.yml
+
8
−
9
View file @
0a9b5271
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
# Globale Konfiguration für alle Server
# Globale Konfiguration für alle Server
##################################################
##################################################
-
hosts
:
all
-
hosts
:
all
remote_user
:
root
remote_user
:
root
roles
:
roles
:
-
{
role
:
all/hostname
,
tags
:
common
}
-
{
role
:
all/hostname
,
tags
:
common
}
...
@@ -12,14 +12,14 @@
...
@@ -12,14 +12,14 @@
##################################################
##################################################
# Produktive Server
# Produktive Server
##################################################
##################################################
-
hosts
:
warpsrvext
-
hosts
:
warpsrvext
remote_user
:
root
remote_user
:
root
roles
:
roles
:
-
{
role
:
common/borgserver
,
tags
:
borgserver
}
-
{
role
:
common/borgserver
,
tags
:
borgserver
}
-
hosts
:
warpsrvint
-
hosts
:
warpsrvint
remote_user
:
root
remote_user
:
root
roles
:
roles
:
...
@@ -39,9 +39,9 @@
...
@@ -39,9 +39,9 @@
-
{
role
:
warpsrvint/docker_unifi
,
tags
:
unifi
}
-
{
role
:
warpsrvint/docker_unifi
,
tags
:
unifi
}
-
{
role
:
warpsrvint/docker_warpinfra
,
tags
:
warpinfra
}
-
{
role
:
warpsrvint/docker_warpinfra
,
tags
:
warpinfra
}
# Entfällt durch develop
# Entfällt durch develop
# - { role: warpsrvint/docker_warpinfratest, tags: warpinfratest }
# - { role: warpsrvint/docker_warpinfratest, tags: warpinfratest }
-
hosts
:
webserver
-
hosts
:
webserver
remote_user
:
root
remote_user
:
root
...
@@ -52,7 +52,6 @@
...
@@ -52,7 +52,6 @@
-
{
role
:
common/openvpn
,
tags
:
openvpn
}
-
{
role
:
common/openvpn
,
tags
:
openvpn
}
-
{
role
:
common/docker_ldap
,
tags
:
ldap
}
-
{
role
:
common/docker_ldap
,
tags
:
ldap
}
-
{
role
:
webserver/docker_dokuwiki
,
tags
:
dokuwiki
}
-
{
role
:
webserver/docker_dokuwiki
,
tags
:
dokuwiki
}
-
{
role
:
webserver/docker_etherpad
,
tags
:
etherpad
}
-
{
role
:
webserver/docker_gitlab
,
tags
:
gitlab
}
-
{
role
:
webserver/docker_gitlab
,
tags
:
gitlab
}
-
{
role
:
webserver/docker_hackmd
,
tags
:
hackmd
}
-
{
role
:
webserver/docker_hackmd
,
tags
:
hackmd
}
-
{
role
:
webserver/docker_jabber
,
tags
:
jabber
}
-
{
role
:
webserver/docker_jabber
,
tags
:
jabber
}
...
@@ -62,7 +61,7 @@
...
@@ -62,7 +61,7 @@
-
{
role
:
webserver/docker_warpinfra
,
tags
:
warpinfra
}
-
{
role
:
webserver/docker_warpinfra
,
tags
:
warpinfra
}
-
{
role
:
webserver/docker_wordpress
,
tags
:
wordpress
}
-
{
role
:
webserver/docker_wordpress
,
tags
:
wordpress
}
# Entfällt durch testserver
# Entfällt durch testserver
# - { role: docker_jabber_test, tags: jabber_test }
# - { role: docker_jabber_test, tags: jabber_test }
# - { role: docker_warpinfratest, tags: warpinfratest }
# - { role: docker_warpinfratest, tags: warpinfratest }
...
@@ -86,7 +85,7 @@
...
@@ -86,7 +85,7 @@
##################################################
##################################################
# Test / Development Server
# Test / Development Server
##################################################
##################################################
-
hosts
:
develop
-
hosts
:
develop
...
@@ -109,7 +108,7 @@
...
@@ -109,7 +108,7 @@
# - { role: ../webserver/docker_jabber, tags: jabber }
# - { role: ../webserver/docker_jabber, tags: jabber }
# - { role: ../webserver/docker_warpinfra, tags: warpinfra }
# - { role: ../webserver/docker_warpinfra, tags: warpinfra }
-
hosts
:
warphab
-
hosts
:
warphab
remote_user
:
root
remote_user
:
root
roles
:
roles
:
-
{
role
:
warphab/homegear
,
tags
:
homegear
}
-
{
role
:
warphab/homegear
,
tags
:
homegear
}
...
...
This diff is collapsed.
Click to expand it.
webserver/docker_dokuwiki/templates/Dockerfile
+
1
−
4
View file @
0a9b5271
FROM
php:7.4-apache
FROM
php:7.4
.11
-apache
# php-gd modul für dw2pdf plugin
# php-gd modul für dw2pdf plugin
RUN
apt-get update
&&
apt-get
install
-y
\
RUN
apt-get update
&&
apt-get
install
-y
\
...
@@ -22,6 +22,3 @@ EXPOSE 80
...
@@ -22,6 +22,3 @@ EXPOSE 80
# startup
# startup
CMD
["apache2-foreground"]
CMD
["apache2-foreground"]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment