Benjamin Renard / cdpp-epn-tap-server

Commit 2c855deda9245ea7e470fc4902225ae36974bdba

Authored by Benjamin Renard
1 parent 0e42615b
Exists in master

Test

Showing 8 changed files with 14 additions and 15 deletions   Show diff stats
Inline Side-by-side
1 # enter here all key = value you need to path in docker-compose.yaml file 1 # enter here all key = value you need to path in docker-compose.yaml file
2 VERSION=10 2 VERSION=10
3 -SERVER=voparis-tap-planeto 3 +SERVER=cdpp-epntap
4 # depot sans l'extension .git 4 # depot sans l'extension .git
5 -GIT=voparis-tap-planeto  
6 -GITURL=https://gitlab.obspm.fr/phamy 5 +GIT=cdpp-epn-tap-server
  6 +GITURL=https://gitlab.irap.omp.eu/CDPP/
conf/000-default.conf
  Diff comments   View file @2c855de
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 # ************************************ 4 # ************************************
5 5
6 <VirtualHost *:8080> 6 <VirtualHost *:8080>
7 - ServerAdmin pierre.lesidaner@obspm.fr 7 + ServerAdmin benjamin.renard@irap.omp.eu
8 ## Vhost docroot 8 ## Vhost docroot
9 DocumentRoot "/var/www" 9 DocumentRoot "/var/www"
10 ## Alias declarations for resources outside the DocumentRoot 10 ## Alias declarations for resources outside the DocumentRoot
conf/awstats.dachs.conf
  Diff comments   View file @2c855de
@@ -153,7 +153,7 @@ LogSeparator=&quot; &quot; @@ -153,7 +153,7 @@ LogSeparator=&quot; &quot;
153 # Example: "ftp.domain.com" 153 # Example: "ftp.domain.com"
154 # Example: "domain.com" 154 # Example: "domain.com"
155 # 155 #
156 -SiteDomain="myserver.mydomain" 156 +SiteDomain="cdpp-epntap.irap.omp.eu"
157 157
158 158
159 # Enter here all other possible domain names, addresses or virtual host 159 # Enter here all other possible domain names, addresses or virtual host
@@ -168,7 +168,7 @@ SiteDomain=&quot;myserver.mydomain&quot; @@ -168,7 +168,7 @@ SiteDomain=&quot;myserver.mydomain&quot;
168 # Note: You can also use @/mypath/myfile if list of aliases are in a file. 168 # Note: You can also use @/mypath/myfile if list of aliases are in a file.
169 # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]" 169 # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
170 # 170 #
171 -HostAliases="localhost 127.0.0.1 myserver.mydomain mydomain" 171 +HostAliases="localhost 127.0.0.1 cdpp-epntap.irap.omp.eu"
172 172
173 173
174 # If you want to have hosts reported by name instead of ip address, AWStats 174 # If you want to have hosts reported by name instead of ip address, AWStats
conf/dachs-dockerfile
  Diff comments   View file @2c855de
@@ -37,12 +37,12 @@ RUN apt-get install -y git openssh-server openssh-client apache2 w3m net-tools v @@ -37,12 +37,12 @@ RUN apt-get install -y git openssh-server openssh-client apache2 w3m net-tools v
37 ### 37 ###
38 38
39 RUN mkdir -p /root/.ssh 39 RUN mkdir -p /root/.ssh
40 -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx1IuqhW3UJmKWc6ODuhXu58CSdHGavVJaTUILUsR3ig359wRQ7GEpwXdk5dcTNOS16xVVx8KP7SEqsOOGRQ14jy2z3rJLZ0tRKzceCk1nXrFgipJ8qU0sFDc+dvXgJ94XvHlZzgQDT/iLeIZ6lhDEHn6O+EdfNf1g32LqIFXEe4fqRsKsM4ssYcHigdh3cdVDU350ACNxRrVEzCRE9lcGcfouwjSNMeWZO5SnCIzl7sOGJroYmL/c17P1YPIE1HzW3FjNI98FxJR2K/TmcUWJYDc7wDalN6HXyquoFsew7Sn/BZH0aprdaTLO1F820MTUIzcF/oKvhMd/Ihz355srm//a4PGQE7RDPdvPSjOr9KSiM/PU0GiARARex1AYl/a4CY5HnKeIs/sJfOADFJTpDcF7TSqKYq51JN1itWNmVMv8zZ/rfHMiEHKiDxLXZsflmdKPynHLI/Wk+uQqLNyORQ5MWJwKRGOp5haoCKxUtHPU68woVO1uk4FawXI0yLp84iXO7RJrr5MMas+Cjzv/azWA/K1WXOjiiWIqAoOHAYKWS2embavVHgIpbK/0wn8q5BF18QBOlqlpkBICOLTXpBLB+tAjmw998nYMF5PKI8synjzHGytd79OtrphO+ADWrCQuWDSxqkzbisJUMn3m1a4Z5CaaX1kjIL0P4RlvLw== phamy" >> /root/.ssh/authorized_keys 40 +RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8LvPlnTGHhoqSARTPjjlxxHJPJ9oS+vvx7TmpC51e4 GitLab OBSPM" >> /root/.ssh/authorized_keys
41 RUN chmod 700 /root/.ssh 41 RUN chmod 700 /root/.ssh
42 RUN chmod 600 /root/.ssh/authorized_keys 42 RUN chmod 600 /root/.ssh/authorized_keys
43 43
44 RUN mkdir -p /home/dachsroot/.ssh 44 RUN mkdir -p /home/dachsroot/.ssh
45 -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx1IuqhW3UJmKWc6ODuhXu58CSdHGavVJaTUILUsR3ig359wRQ7GEpwXdk5dcTNOS16xVVx8KP7SEqsOOGRQ14jy2z3rJLZ0tRKzceCk1nXrFgipJ8qU0sFDc+dvXgJ94XvHlZzgQDT/iLeIZ6lhDEHn6O+EdfNf1g32LqIFXEe4fqRsKsM4ssYcHigdh3cdVDU350ACNxRrVEzCRE9lcGcfouwjSNMeWZO5SnCIzl7sOGJroYmL/c17P1YPIE1HzW3FjNI98FxJR2K/TmcUWJYDc7wDalN6HXyquoFsew7Sn/BZH0aprdaTLO1F820MTUIzcF/oKvhMd/Ihz355srm//a4PGQE7RDPdvPSjOr9KSiM/PU0GiARARex1AYl/a4CY5HnKeIs/sJfOADFJTpDcF7TSqKYq51JN1itWNmVMv8zZ/rfHMiEHKiDxLXZsflmdKPynHLI/Wk+uQqLNyORQ5MWJwKRGOp5haoCKxUtHPU68woVO1uk4FawXI0yLp84iXO7RJrr5MMas+Cjzv/azWA/K1WXOjiiWIqAoOHAYKWS2embavVHgIpbK/0wn8q5BF18QBOlqlpkBICOLTXpBLB+tAjmw998nYMF5PKI8synjzHGytd79OtrphO+ADWrCQuWDSxqkzbisJUMn3m1a4Z5CaaX1kjIL0P4RlvLw== phamy" >> /home/dachsroot/.ssh/authorized_keys 45 +RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8LvPlnTGHhoqSARTPjjlxxHJPJ9oS+vvx7TmpC51e4 GitLab OBSPM" >> /home/dachsroot/.ssh/authorized_keys
46 RUN chmod 700 /home/dachsroot/.ssh 46 RUN chmod 700 /home/dachsroot/.ssh
47 RUN chmod 600 /home/dachsroot/.ssh/authorized_keys 47 RUN chmod 600 /home/dachsroot/.ssh/authorized_keys
48 RUN chown dachsroot:gavo -R /home/dachsroot/.ssh 48 RUN chown dachsroot:gavo -R /home/dachsroot/.ssh
conf/docker-compose.yml
  Diff comments   View file @2c855de
@@ -2,8 +2,8 @@ version: &quot;3.7&quot; @@ -2,8 +2,8 @@ version: &quot;3.7&quot;
2 services: 2 services:
3 3
4 dachs: 4 dachs:
5 - container_name: dachs-voparis  
6 - image: dachs-voparis 5 + container_name: dachs-cdpp
  6 + image: dachs-cdpp
7 tty: true 7 tty: true
8 expose: 8 expose:
9 - "80" 9 - "80"
@@ -26,4 +26,4 @@ services: @@ -26,4 +26,4 @@ services:
26 26
27 secrets: 27 secrets:
28 id_rsa: 28 id_rsa:
29 - file: id_rsa-phamy.prive 29 + file: rsa.prive
1 [general] 1 [general]
2 rootDir: /var/gavo 2 rootDir: /var/gavo
3 -maintainerAddress: pierre.lesidaner@obspm.fr 3 +maintainerAddress: benjamin.renard@irap.omp.eu
4 [web] 4 [web]
5 bindAddress: 5 bindAddress:
6 serverPort: 80 6 serverPort: 80
7 #serverURL: http://145.238.197.199:81 7 #serverURL: http://145.238.197.199:81
8 serverURL: http://127.0.0.1:80 8 serverURL: http://127.0.0.1:80
9 -sitename: portablelp 9 +sitename: CDPP EPN-TAP server
10 corsOriginPat: http.* 10 corsOriginPat: http.*
11 logFormat: combined 11 logFormat: combined
12 [ivoa] 12 [ivoa]
13 -authority: vopdc.obspm 13 +authority: cdpp
conf/id_rsa-phamy.prive deleted
View file @0e42615
No preview for this file type
conf/rsa.prive 0 → 100644
  Diff comments   View file @2c855de